diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 93ea76e63c7..e118318f8f9 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -247,6 +247,7 @@ class MachCommands(CommandBase): if android: # Build OpenSSL for android + env["OPENSSL_VERSION"] = "1.0.2k" make_cmd = ["make"] if jobs is not None: make_cmd += ["-j" + jobs] @@ -264,7 +265,7 @@ class MachCommands(CommandBase): verbose=verbose) if status: return status - openssl_dir = path.join(openssl_dir, "openssl-1.0.1t") + openssl_dir = path.join(openssl_dir, "openssl-{}".format(env["OPENSSL_VERSION"])) env['OPENSSL_LIB_DIR'] = openssl_dir env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include") env['OPENSSL_STATIC'] = 'TRUE' diff --git a/support/android/openssl.makefile b/support/android/openssl.makefile index a052fdbb6a1..cfa720d2c3a 100644 --- a/support/android/openssl.makefile +++ b/support/android/openssl.makefile @@ -4,11 +4,11 @@ all: openssl # From http://wiki.openssl.org/index.php/Android .PHONY: openssl -openssl: openssl-1.0.1t/libssl.so +openssl: openssl-${OPENSSL_VERSION}/libssl.so -openssl-1.0.1t/libssl.so: openssl-1.0.1t/Configure - ./openssl.sh ${ANDROID_NDK} +openssl-${OPENSSL_VERSION}/libssl.so: openssl-${OPENSSL_VERSION}/Configure + ./openssl.sh ${ANDROID_NDK} ${OPENSSL_VERSION} -openssl-1.0.1t/Configure: - wget https://www.openssl.org/source/old/1.0.1/openssl-1.0.1t.tar.gz - tar -zxf openssl-1.0.1t.tar.gz +openssl-${OPENSSL_VERSION}/Configure: + URL=https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/openssl-${OPENSSL_VERSION}.tar.gz; \ + curl $$URL | tar xzf - diff --git a/support/android/openssl.sh b/support/android/openssl.sh index 7968115c887..65c3ed2c95a 100755 --- a/support/android/openssl.sh +++ b/support/android/openssl.sh @@ -181,7 +181,7 @@ if [ ! -z "$VERBOSE" ] && [ "$VERBOSE" != "0" ]; then echo "ANDROID_DEV: $ANDROID_DEV" fi -cd openssl-1.0.1t +cd openssl-$2 perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org # The code being built isn't maintained by us, so we redirect stderr to stdout