Merge pull request #3192 from glennw/disable-android-ssl

Disable ssl on android as openssl needs to be added to build system.

configure

@@ -530,7 +530,6 @@ CFG_SUBMODULES="\
     support/skia/skia \
     support/spidermonkey/mozjs \
     support/spidermonkey/rust-mozjs \
-    support/ssl/rust-openssl \
     support/stb-image/rust-stb-image \
     support/png/libpng \
     support/png/rust-png \
@@ -553,6 +552,7 @@ CFG_SUBMODULES="\
     support/glfw/glfw-rs \
     platform/macos/rust-cocoa \
     platform/macos/rust-task_info \
+    support/ssl/rust-openssl \
     ${CFG_SUBMODULES}"
 fi
 
@@ -565,6 +565,7 @@ CFG_SUBMODULES="\
     support/glfw/glfw-rs \
     platform/linux/rust-fontconfig \
     platform/linux/rust-freetype \
+    support/ssl/rust-openssl \
     ${CFG_SUBMODULES}"
 fi
 
@@ -750,6 +751,9 @@ do
         support/url/rust-url)
             CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/support/url/configure"
             ;;
+        support/http/rust-http)
+            CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/support/http/rust-http/configure.servo"
+            ;;
         *)
             ;;
     esac

mk/sub.mk

@@ -100,12 +100,6 @@ DEPS_rust-url += \
 	rust-encoding \
 	$(NULL)
 
-DEPS_rust-http += \
-	rust-encoding \
-	rust-url \
-	rust-openssl \
-	$(NULL)
-
 DEPS_string-cache += \
 	rust-phf \
 	rust \
@@ -161,6 +155,12 @@ DEPS_rust-layers += \
 	rust \
 	$(NULL)
 
+DEPS_rust-http += \
+	rust-encoding \
+	rust-url \
+	rust-openssl \
+	$(NULL)
+
 endif
 
 ifeq ($(CFG_OSTYPE),unknown-linux-gnu)
@@ -186,6 +186,12 @@ DEPS_rust-fontconfig += \
 	rust \
 	$(NULL)
 
+DEPS_rust-http += \
+	rust-encoding \
+	rust-url \
+	rust-openssl \
+	$(NULL)
+
 NATIVE_BUILD += \
 	fontconfig \
 	$(NULL)
@@ -240,6 +246,11 @@ CXXFLAGS_skia += \
 	-I$(S)src/platform/android/libfreetype2/include \
 	$(NULL)
 
+DEPS_rust-http += \
+	rust-encoding \
+	rust-url \
+	$(NULL)
+
 NATIVE_BUILD += \
 	libfreetype2 \
 	libexpat \

src/support/http/rust-http

@@ -1 +1 @@
-Subproject commit d0d2cbe0506b45941cb560d6fdab13e4c0d63d5d
+Subproject commit d07678333c5f9faa4886f7261386f5bf55c1fd5e