Skip to content

Commit e01d2ff

Browse files
committed
build-depends-android.sh support newer versions of NDK.
Minimum API level changed to 16 from 14. Define -D__ANDROID_API__ to choose correct API level in unified headers. Fixes undefined reference to 'stdout'.
1 parent 1b1acd7 commit e01d2ff

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

build-depends-android.sh

+8-6
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@ SQLCIPHER_CFLAGS="-DSQLITE_DEFAULT_WORKER_THREADS=2 \
1515
-DSQLITE_ENABLE_FTS3_TOKENIZER \
1616
-DSQLITE_ENABLE_STAT4 \
1717
-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
18-
-DSQLITE_HAS_CODEC -DOMIT_MEMLOCK -DOMIT_CONSTTIME_MEM"
18+
-DSQLITE_ENABLE_DBSTAT_VTAB \
19+
-DSQLITE_HAS_CODEC -DOMIT_MEMLOCK -DOMIT_MEM_SECURITY"
1920

2021
SQLCIPHER_CONFIG="--disable-shared --enable-static \
2122
--enable-fts3 --enable-fts4 --enable-fts5 --enable-json1 --enable-session \
2223
--enable-tempstore=always --enable-threadsafe=multi --disable-tcl"
2324

2425
USE_CLANG=1
2526
BUILD_ARCHS="arm,arm64,x86,x86_64"
26-
BUILD_API=14
27+
BUILD_API=16
2728
BUILD_PIE=1
2829
BUILD_CRYPTO=1
2930
BUILD_SQLCIPHER=0
@@ -102,13 +103,14 @@ done
102103

103104
# Fix API level and architectures
104105
case "$BUILD_API" in
105-
[0-9]|1[0-1]) BUILD_API=9 ;;
106+
[0-9]|1[0-5]) BUILD_API=16 ;;
106107
20) BUILD_API=19 ;;
107108
22) BUILD_API=21 ;;
109+
25) BUILD_API=24 ;;
108110
[0-9][0-9]) ;;
109-
*) BUILD_API=12 ;;
111+
*) BUILD_API=16 ;;
110112
esac
111-
[ "$BUILD_API" -gt 24 ] && BUILD_API=24
113+
[ "$BUILD_API" -gt 28 ] && BUILD_API=28
112114
BUILD_ARCHS=${BUILD_ARCHS//,/ }
113115

114116
# Check dependency sources
@@ -196,7 +198,7 @@ for android_arch in $BUILD_ARCHS; do
196198
fi
197199

198200
android_cc="$gcc_prefix-gcc --sysroot=$android_sysroot"
199-
android_cflags="$android_cflags -g -Wall -funwind-tables -fstack-protector -fomit-frame-pointer -DNDEBUG -DANDROID"
201+
android_cflags="$android_cflags -g -Wall -funwind-tables -fstack-protector -fomit-frame-pointer -DNDEBUG -DANDROID -D__ANDROID_API__=$android_api"
200202
android_path="$ANDROID_NDK_ROOT/toolchains/$android_eabi-4.9/prebuilt/$ndk_host/bin"
201203
android_prefix="$(pwd)/android/prebuilt/$android_arch"
202204

0 commit comments

Comments
 (0)