Skip to content

(only a question) use most recent NDK #456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

(only a question) use most recent NDK #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions android-database-sqlcipher/build-openssl-libraries.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
MINIMUM_ANDROID_SDK_VERSION=$1
MINIMUM_ANDROID_64_BIT_SDK_VERSION=$2
OPENSSL=openssl-$3
ANDROID_NDK_ROOT=$ANDROID_HOME/ndk-bundle

(cd src/main/external/;
gunzip -c ${OPENSSL}.tar.gz | tar xf -
Expand Down Expand Up @@ -57,19 +58,10 @@ OPENSSL=openssl-$3

rm -rf ${ANDROID_LIB_ROOT}

for SQLCIPHER_TARGET_PLATFORM in armeabi armeabi-v7a x86 x86_64 arm64-v8a
for SQLCIPHER_TARGET_PLATFORM in armeabi-v7a x86 x86_64 arm64-v8a
do
echo "Building libcrypto.a for ${SQLCIPHER_TARGET_PLATFORM}"
case "${SQLCIPHER_TARGET_PLATFORM}" in
armeabi)
TOOLCHAIN_ARCH=arm
TOOLCHAIN_PREFIX=arm-linux-androideabi
TOOLCHAIN_FOLDER=arm-linux-androideabi
CONFIGURE_ARCH=android-arm
ANDROID_API_VERSION=${MINIMUM_ANDROID_SDK_VERSION}
OFFSET_BITS=32
TOOLCHAIN_DIR=${ANDROID_TOOLCHAIN_DIR}-armeabi
;;
armeabi-v7a)
TOOLCHAIN_ARCH=arm
TOOLCHAIN_PREFIX=arm-linux-androideabi
Expand Down Expand Up @@ -116,8 +108,7 @@ OPENSSL=openssl-$3
python ${ANDROID_NDK_ROOT}/build/tools/make_standalone_toolchain.py \
--arch ${TOOLCHAIN_ARCH} \
--api ${ANDROID_API_VERSION} \
--install-dir ${TOOLCHAIN_DIR} \
--unified-headers
--install-dir ${TOOLCHAIN_DIR}

if [ $? -ne 0 ]; then
echo "Error executing make_standalone_toolchain.py for ${TOOLCHAIN_ARCH}"
Expand Down
2 changes: 1 addition & 1 deletion android-database-sqlcipher/src/main/cpp/Application32.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP_PROJECT_PATH := $(shell pwd)
APP_ABI := armeabi armeabi-v7a x86
APP_ABI := armeabi-v7a x86
APP_PLATFORM := android-$(NDK_APP_PLATFORM)
APP_BUILD_SCRIPT := $(APP_PROJECT_PATH)/Android.mk
APP_STL := stlport_static
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ ext {
mavenDeveloperEmail = "support@zetetic.net"
mavenDeveloperOrganization = "Zetetic LLC"
mavenDeveloperUrl = "https://www.zetetic.net"
minimumAndroidSdkVersion = 14
minimumAndroidSdkVersion = 16
minimumAndroid64BitSdkVersion = 21
targetAndroidSdkVersion = 26
compileAndroidSdkVersion = 26
Expand Down