From 778d61c291ab5829640c5689b4c1a92ac8abd2db Mon Sep 17 00:00:00 2001
From: DavidKorczynski <david@adalogics.com>
Date: Tue, 9 Jun 2020 19:38:07 +0100
Subject: [PATCH] [servo] merging of servo components into one project folder
 (#3950)

* Moved html5ever to servo project.

* Added rust-url to servo fuzzing project.

* Fix project link.
---
 projects/{html5ever => servo}/Dockerfile   | 2 ++
 projects/{html5ever => servo}/build.sh     | 4 ++++
 projects/{html5ever => servo}/project.yaml | 5 +++--
 3 files changed, 9 insertions(+), 2 deletions(-)
 rename projects/{html5ever => servo}/Dockerfile (93%)
 rename projects/{html5ever => servo}/build.sh (87%)
 rename projects/{html5ever => servo}/project.yaml (74%)

diff --git a/projects/html5ever/Dockerfile b/projects/servo/Dockerfile
similarity index 93%
rename from projects/html5ever/Dockerfile
rename to projects/servo/Dockerfile
index 797d4c6fb..9de604f1e 100644
--- a/projects/html5ever/Dockerfile
+++ b/projects/servo/Dockerfile
@@ -17,5 +17,7 @@ FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER david@adalogics.com
 
 RUN git clone --depth 1 https://github.com/servo/html5ever
+RUN git clone --depth 1 https://github.com/servo/rust-url
+
 WORKDIR $SRC
 COPY build.sh $SRC/
diff --git a/projects/html5ever/build.sh b/projects/servo/build.sh
similarity index 87%
rename from projects/html5ever/build.sh
rename to projects/servo/build.sh
index 4d7e1e3b9..b9c3710c6 100755
--- a/projects/html5ever/build.sh
+++ b/projects/servo/build.sh
@@ -18,3 +18,7 @@
 cd $SRC/html5ever/html5ever
 cargo fuzz build -O 
 cp fuzz/target/x86_64-unknown-linux-gnu/release/fuzz_document_parse $OUT/
+
+cd $SRC/rust-url
+cargo fuzz build -O
+cp fuzz/target/x86_64-unknown-linux-gnu/release/parse $OUT/fuzz-url-parse
diff --git a/projects/html5ever/project.yaml b/projects/servo/project.yaml
similarity index 74%
rename from projects/html5ever/project.yaml
rename to projects/servo/project.yaml
index a4a339fc9..48953fc14 100644
--- a/projects/html5ever/project.yaml
+++ b/projects/servo/project.yaml
@@ -1,4 +1,4 @@
-homepage: "https://github.com/servo/html5ever"
+homepage: "https://github.com/servo"
 primary_contact: "servo-ops@mozilla.com"
 sanitizers:
   - address
@@ -6,5 +6,6 @@ fuzzing_engines:
   - libfuzzer
 language: rust
 auto_ccs:
-  - "david@adalogics.com"
   - "jmatthews@mozilla.com"
+  - "vgosu@mozilla.com"
+  - "david@adalogics.com"