Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10997 - mbrubeck:openssl-1.0.1t, r=aneeshusa

Browse source 
Upgrade to OpenSSL 1.0.1t on Android

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10997)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-05-04 06:18:28 -07:00
commit 7a439e6237
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python/servo/build_commands.py
View file

@ -222,7 +222,7 @@ class MachCommands(CommandBase):
verbose=verbose)
if status:
return status
openssl_dir = path.join(openssl_dir, "openssl-1.0.1k")
openssl_dir = path.join(openssl_dir, "openssl-1.0.1t")
env['OPENSSL_LIB_DIR'] = openssl_dir
env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include")
env['OPENSSL_STATIC'] = 'TRUE'

10
support/android/openssl.makefile
View file

@ -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

2
support/android/openssl.sh
View file

@ -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