8000 Initial support for armeabi-v7a · calow/android-database-sqlcipher@ae89fb4 · GitHub
[go: up one dir, main page]
Skip to content

Commit ae89fb4

Browse files
developernotesdevelopernotes
committed
Initial support for armeabi-v7a
1 parent c6e293c commit ae89fb4

17 files changed

+34
-1
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ bin/
1010
gen/
1111
external/openssl
1212
external/sqlcipher
13+
libs/

‎Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ clean:
6161
-rm ${LIBRARY_ROOT}/x86/libsqlcipher_android.so
6262
-rm ${LIBRARY_ROOT}/x86/libdatabase_sqlcipher.so
6363
-rm ${LIBRARY_ROOT}/x86/libstlport_shared.so
64+
-rm ${LIBRARY_ROOT}/armeabi-v7a/libsqlcipher_android.so
65+
-rm ${LIBRARY_ROOT}/armeabi-v7a/libdatabase_sqlcipher.so
66+
-rm ${LIBRARY_ROOT}/armeabi-v7a/libstlport_shared.so
6467

6568
copy-libs:
6669
mkdir -p ${LIBRARY_ROOT}/armeabi
@@ -78,6 +81,13 @@ copy-libs:
7881
${LIBRARY_ROOT}/x86 && \
7982
cp ${EXTERNAL_DIR}/libs/x86/libstlport_shared.so \
8083
${LIBRARY_ROOT}/x86
84+
mkdir -p ${LIBRARY_ROOT}/armeabi-v7a
85+
cp ${EXTERNAL_DIR}/libs/armeabi-v7a/libsqlcipher_android.so \
86+
${LIBRARY_ROOT}/armeabi-v7a && \
87+
cp ${JNI_DIR}/libs/armeabi-v7a/libdatabase_sqlcipher.so \
88+
${LIBRARY_ROOT}/armeabi-v7a && \
89+
cp ${EXTERNAL_DIR}/libs/armeabi-v7a/libstlport_shared.so \
90+
${LIBRARY_ROOT}/armeabi-v7a
8191

8292
copy-libs-dist:
8393
cp ${LIBRARY_ROOT}/*.jar dist/SQLCipherForAndroid-SDK/libs/ && \

‎build-openssl-libraries.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
no-ocsp no-x509v3 no-ui no-srp no-ssltrace no-tlsext \
4141
no-mdc2 no-ecdh no-engine no-tls2 no-srtp
4242

43+
# arm build
4344
${ANDROID_NDK_ROOT}/build/tools/make-standalone-toolchain.sh \
4445
--platform=${ANDROID_PLATFORM_VERSION} \
4546
--install-dir=${ANDROID_TOOLCHAIN_DIR} \
@@ -59,6 +60,27 @@
5960

6061
rm -rf ${ANDROID_TOOLCHAIN_DIR}
6162

63+
#armv7 build
64+
${ANDROID_NDK_ROOT}/build/tools/make-standalone-toolchain.sh \
65+
--platform=${ANDROID_PLATFORM_VERSION} \
66+
--install-dir=${ANDROID_TOOLCHAIN_DIR} \
67+
--system=${TOOLCHAIN_SYSTEM} \
68+
--arch=arm
69+
70+
export PATH=${ANDROID_TOOLCHAIN_DIR}/bin:$PATH
71+
72+
RANLIB=arm-linux-androideabi-ranlib \
73+
AR=arm-linux-androideabi-ar \
74+
CC=arm-linux-androideabi-gcc \
75+
./Configure android-armv7 ${OPENSSL_EXCLUSION_LIST}
76+
77+
make build_crypto
78+
79+
mv libcrypto.a ../android-libs/armeabi-v7a/
80+
81+
rm -rf ${ANDROID_TOOLCHAIN_DIR}
82+
83+
# x86 build
6284
${ANDROID_NDK_ROOT}/build/tools/make-standalone-toolchain.sh \
6385
--platform=${ANDROID_PLATFORM_VERSION} \
6486
--install-dir=${ANDROID_TOOLCHAIN_DIR} \

‎external/android-libs/armeabi-v7a/libandroid_runtime.so

466 KB
Binary file not shown.

‎external/android-libs/armeabi-v7a/libbinder.so

146 KB
Binary file not shown.

‎external/android-libs/armeabi-v7a/libcrypto.a

2.47 MB
Binary file not shown.

‎external/android-libs/armeabi-v7a/libcutils.so

58 KB
Binary file not shown.

‎external/android-libs/armeabi-v7a/liblog.so

13.2 KB
Binary file not shown.

‎external/android-libs/armeabi-v7a/libnativehelper.so

198 KB
Binary file not shown.

‎external/android-libs/armeabi-v7a/libutils.so

148 KB
Binary file not shown.

‎external/android-libs/armeabi/libcrypto.a

0 Bytes
Binary file not shown.

‎external/android-libs/x86/libcrypto.a

0 Bytes
Binary file not shown.

‎jni/Application.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
APP_PROJECT_PATH := $(shell pwd)
2-
APP_ABI := armeabi x86
2+
APP_ABI := armeabi armeabi-v7a x86
33
APP_BUILD_SCRIPT := $(APP_PROJECT_PATH)/Android.mk
44
# fixes this error when building external/android-sqlite/android/sqlite3_android.cpp
55
# icu4c/common/unicode/std_string.h:39:18: error: string: No such file or directory

‎libs/armeabi/libdatabase_sqlcipher.so

-174 KB
Binary file not shown.

‎libs/armeabi/libstlport_shared.so

-393 KB
Binary file not shown.

‎libs/x86/libdatabase_sqlcipher.so

-1.41 MB
Binary file not shown.

‎libs/x86/libstlport_shared.so

-445 KB
Binary file not shown.

0 commit comments

Comments
 (0)
0