diff options
| author | Matt Brubeck <mbrubeck@limpet.net> | 2016-05-03 15:46:07 -0700 |
|---|---|---|
| committer | Matt Brubeck <mbrubeck@limpet.net> | 2016-05-03 15:46:18 -0700 |
| commit | e1386cad6fdfd0776f65da6a0ff7a0a8563df667 (patch) | |
| tree | 3db2642c6741876adb96c86e5fad2c746bd3d083 /support | |
| parent | 3f2ceeff5dd1966dafe34381e20ec405ab72ccee (diff) | |
| download | servo-e1386cad6fdfd0776f65da6a0ff7a0a8563df667.tar.gz servo-e1386cad6fdfd0776f65da6a0ff7a0a8563df667.zip | |
Upgrade to OpenSSL 1.0.1t on Android
Diffstat (limited to 'support')
| -rw-r--r-- | support/android/openssl.makefile | 10 | ||||
| -rwxr-xr-x | support/android/openssl.sh | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/support/android/openssl.makefile b/support/android/openssl.makefile index d8ff1d665d1..6ababf0fd25 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.1k/libssl.so +openssl: openssl-1.0.1t/libssl.so -openssl-1.0.1k/libssl.so: openssl-1.0.1k/Configure +openssl-1.0.1t/libssl.so: openssl-1.0.1t/Configure ./openssl.sh ${ANDROID_NDK} -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 +openssl-1.0.1t/Configure: + wget https://www.openssl.org/source/openssl-1.0.1t.tar.gz + tar -zxf openssl-1.0.1t.tar.gz diff --git a/support/android/openssl.sh b/support/android/openssl.sh index f47aad07339..18dd9b2f325 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.1k +cd openssl-1.0.1t 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 |