Add rust-url as a submodule and a Makefile for it.

.gitmodules

@@ -124,3 +124,6 @@
 [submodule "src/support/stringcache/string-cache"]
 	path = src/support/stringcache/string-cache
 	url = https://github.com/mozilla-servo/string-cache.git
+[submodule "src/support/url/rust-url"]
+	path = src/support/url/rust-url
+	url = https://github.com/mozilla-servo/rust-url.git

configure

@@ -528,7 +528,8 @@ CFG_SUBMODULES="\
     support/opengles/rust-opengles \
     support/sharegl/sharegl \
     support/phf/rust-phf \
-    support/stringcache/string-cache"
+    support/stringcache/string-cache \
+    support/url/rust-url"
 
 if [ $CFG_OSTYPE = "apple-darwin" ]
 then
@@ -748,6 +749,9 @@ do
         support/phf/rust-phf)
             ENABLE_DEBUG=""
             ;;
+        support/url/rust-url)
+            CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/support/url/configure"
+            ;;
         *)
             ;;
     esac

mk/sub.mk

@@ -91,6 +91,10 @@ DEPS_rust-png += \
 	libpng \
 	$(NULL)
 
+DEPS_rust-url += \
+	rust-encoding \
+	$(NULL)
+
 # Platform-specific dependencies
 ifeq ($(CFG_OSTYPE),apple-darwin)
 DEPS_rust-azure += \

src/support/url/Makefile.in

@@ -0,0 +1,25 @@
+VPATH=%VPATH%
+
+RUSTC ?= rustc
+RUSTFLAGS ?=
+EXT_DEPS ?=
+
+SRC=$(shell find $(VPATH)/src -type f)
+
+.PHONY: all
+all: 	liburl.dummy
+
+liburl.dummy: src/url.rs $(SRC) $(EXT_DEPS)
+	$(RUSTC) $(RUSTFLAGS) $< --out-dir .
+	touch $@
+
+url-test: src/url.rs $(SRC)
+	$(RUSTC) $(RUSTFLAGS) $< -o $@ --test
+
+.PHONY: check
+check: url-test
+	./url-test $(TEST)
+
+.PHONY: clean
+clean:
+	rm -f *.o *.a *.so *.dylib *.rlib *.dll *.dummy *-test

src/support/url/configure

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+SRCDIR="$(cd $(dirname $0) && pwd)"
+sed "s#%VPATH%#${SRCDIR}/rust-url#" ${SRCDIR}/Makefile.in > Makefile

src/support/url/rust-url

@@ -0,0 +1 @@
+Subproject commit 19c1aa0e73c3252761ca3d722cba9cc0ae1ba1ca