mirror of
https://github.com/servo/servo.git
synced 2025-08-06 22:15:33 +01:00
Update android openssl version due to security advisory https://www.openssl.org/news/secadv_20150108.txt
This commit is contained in:
parent
7800d98728
commit
7818576213
4 changed files with 9 additions and 9 deletions
4
support/android/.gitignore
vendored
4
support/android/.gitignore
vendored
|
@ -1,3 +1,3 @@
|
|||
openssl-1.0.1j/
|
||||
openssl-1.0.1j.tar.gz
|
||||
openssl-1.0.1k/
|
||||
openssl-1.0.1k.tar.gz
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue