Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Disable ssl on android as openssl needs to be added to build system.
This commit is contained in:
glennw 2014-09-01 13:03:16 +10:00
commit 9284e44328
3 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
configure vendored
View file

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

23
mk/sub.mk
View file

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

2
src/support/http/rust-http

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