diff options
| -rw-r--r-- | python/servo/build_commands.py | 2 | ||||
| -rw-r--r-- | support/android/.gitignore | 4 | ||||
| -rw-r--r-- | support/android/openssl.makefile | 10 | ||||
| -rwxr-xr-x | support/android/openssl.sh | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 540c0f1601b..aafaa815af1 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -83,7 +83,7 @@ class MachCommands(CommandBase): status = subprocess.call( ["make", "-j4", "-f", "openssl.makefile"], env=self.build_env()) - env['OPENSSL_PATH'] = path.join(self.android_support_dir(), "openssl-1.0.1j") + env['OPENSSL_PATH'] = path.join(self.android_support_dir(), "openssl-1.0.1k") status = subprocess.call( ["cargo", "build"] + opts, diff --git a/support/android/.gitignore b/support/android/.gitignore index 1d0971b22e9..1071c3d9fe4 100644 --- a/support/android/.gitignore +++ b/support/android/.gitignore @@ -1,3 +1,3 @@ -openssl-1.0.1j/ -openssl-1.0.1j.tar.gz +openssl-1.0.1k/ +openssl-1.0.1k.tar.gz diff --git a/support/android/openssl.makefile b/support/android/openssl.makefile index 081bafb1afb..60f3d38cbd6 100644 --- a/support/android/openssl.makefile +++ b/support/android/openssl.makefile @@ -3,11 +3,11 @@ all: openssl # From http://wiki.openssl.org/index.php/Android .PHONY: openssl -openssl: openssl-1.0.1j/libssl.so +openssl: openssl-1.0.1k/libssl.so -openssl-1.0.1j/libssl.so: openssl-1.0.1j/Configure +openssl-1.0.1k/libssl.so: openssl-1.0.1k/Configure ./openssl.sh ${ANDROID_NDK} -openssl-1.0.1j/Configure: - wget https://www.openssl.org/source/openssl-1.0.1j.tar.gz - tar -zxf openssl-1.0.1j.tar.gz +openssl-1.0.1k/Configure: + wget https://www.openssl.org/source/openssl-1.0.1k.tar.gz + tar -zxf openssl-1.0.1k.tar.gz diff --git a/support/android/openssl.sh b/support/android/openssl.sh index 201503ea451..f49fa467d31 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.1j +cd openssl-1.0.1k perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org ./config shared -no-ssl2 -no-ssl3 -no-comp -no-hw -no-engine --openssldir=/usr/local/ssl/$ANDROID_API make depend |