Skip to content

Commit 098ecdb

Browse files
Remove text relocations for Android API 23
1 parent dc376f5 commit 098ecdb

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

build-openssl-libraries.sh

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333

3434
ANDROID_PLATFORM_VERSION=android-19
3535
ANDROID_TOOLCHAIN_DIR=/tmp/sqlcipher-android-toolchain
36-
OPENSSL_EXCLUSION_LIST=no-krb5 no-gost no-idea no-camellia \
37-
no-seed no-bf no-cast no-rc2 no-rc4 no-rc5 no-md2 \
38-
no-md4 no-ripemd no-rsa no-ecdh no-sock no-ssl2 no-ssl3 \
39-
no-dsa no-dh no-ec no-ecdsa no-tls1 no-x509 no-pkcs7 \
40-
no-pbe no-pkcs no-tlsext no-pem no-rfc3779 no-whirlpool \
41-
no-ocsp no-x509v3 no-ui no-srp no-ssltrace no-tlsext \
42-
no-mdc2 no-ecdh no-engine no-tls2 no-srtp
36+
OPENSSL_CONFIGURE_OPTIONS="-no-krb5 no-idea no-camellia
37+
no-seed no-bf no-cast no-rc2 no-rc4 no-rc5 no-md2
38+
no-md4 no-ripemd no-rsa no-ecdh no-sock no-ssl2 no-ssl3
39+
no-dsa no-dh no-ec no-ecdsa no-tls1 no-pbe no-pkcs
40+
no-tlsext no-pem no-rfc3779 no-whirlpool no-ui no-srp
41+
no-ssltrace no-tlsext no-mdc2 no-ecdh no-engine
42+
no-tls2 no-srtp -fPIC"
4343

4444
# arm build
4545
${ANDROID_NDK_ROOT}/build/tools/make-standalone-toolchain.sh \
@@ -53,8 +53,9 @@
5353
RANLIB=arm-linux-androideabi-ranlib \
5454
AR=arm-linux-androideabi-ar \
5555
CC=arm-linux-androideabi-gcc \
56-
./Configure android ${OPENSSL_EXCLUSION_LIST}
56+
./Configure android ${OPENSSL_CONFIGURE_OPTIONS}
5757

58+
make clean
5859
make build_crypto
5960

6061
mv libcrypto.a ../android-libs/armeabi/
@@ -73,8 +74,9 @@
7374
RANLIB=arm-linux-androideabi-ranlib \
7475
AR=arm-linux-androideabi-ar \
7576
CC=arm-linux-androideabi-gcc \
76-
./Configure android-armv7 ${OPENSSL_EXCLUSION_LIST}
77+
./Configure android-armv7 ${OPENSSL_CONFIGURE_OPTIONS}
7778

79+
make clean
7880
make build_crypto
7981

8082
mv libcrypto.a ../android-libs/armeabi-v7a/
@@ -93,8 +95,9 @@
9395
RANLIB=i686-linux-android-ranlib \
9496
AR=i686-linux-android-ar \
9597
CC=i686-linux-android-gcc \
96-
./Configure android-x86 ${OPENSSL_EXCLUSION_LIST}
98+
./Configure android-x86 ${OPENSSL_CONFIGURE_OPTIONS}
9799

100+
make clean
98101
make build_crypto
99102

100103
mv libcrypto.a ../android-libs/x86/
-781 KB
Binary file not shown.
-792 KB
Binary file not shown.

external/android-libs/x86/libcrypto.a

-938 KB
Binary file not shown.

0 commit comments

Comments
 (0)