Fixes for android build scripts
M committed
Dec 29, 2021 at 23:50 UTC
d8ccc1637398983a3a6bc5e4c77d0e8705880854
2 files changed
+13
-3
scripts/android/build_iconv.sh
+3
-3
@@ -17,9 +17,9 @@ PATH="${TOOLCHAIN_BASE_DIR}_${arch}/bin:${ORIGINAL_PATH}"
17
18
case $arch in
19
"aarch" )
20
- CLANG=armv7a-linux-androideabi-clang
21
- CXXLANG=arm-linux-androideabi-clang++
22
- HOST="arm-linux-android";;
20
+ CLANG=arm-linux-androideabi-clang
21
+ CXXLANG=arm-linux-androideabi-clang++
22
+ HOST="arm-linux-android";;
23
* )
24
CLANG=${arch}-linux-android-clang
25
CXXLANG=${arch}-linux-android-clang++
scripts/android/install_ndk.sh
+10
@@ -1,8 +1,18 @@
1
#!/bin/sh
2
3
. ./config.sh
4
+TOOLCHAIN_DIR=${WORKDIR}/toolchain
5
+TOOLCHAIN_A32_DIR=${TOOLCHAIN_DIR}_aarch
6
+TOOLCHAIN_A64_DIR=${TOOLCHAIN_DIR}_aarch64
7
+TOOLCHAIN_x86_DIR=${TOOLCHAIN_DIR}_i686
8
+TOOLCHAIN_x86_64_DIR=${TOOLCHAIN_DIR}_x86_64
9
ANDROID_NDK_SHA256="3f541adbd0330a9205ba12697f6d04ec90752c53d6b622101a2a8a856e816589"
10
11
curl https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip -o ${ANDROID_NDK_ZIP}
12
echo $ANDROID_NDK_SHA256 $ANDROID_NDK_ZIP | sha256sum -c || exit 1
13
unzip /opt/android/android-ndk-r17c.zip -d $WORKDIR
14
+
15
+${ANDROID_NDK_ROOT}/build/tools/make_standalone_toolchain.py --arch arm64 --api $API --install-dir ${TOOLCHAIN_A64_DIR} --stl=libc++
16
+${ANDROID_NDK_ROOT}/build/tools/make_standalone_toolchain.py --arch arm --api $API --install-dir ${TOOLCHAIN_A32_DIR} --stl=libc++
17
+${ANDROID_NDK_ROOT}/build/tools/make_standalone_toolchain.py --arch x86 --api $API --install-dir ${TOOLCHAIN_x86_DIR} --stl=libc++
18
+${ANDROID_NDK_ROOT}/build/tools/make_standalone_toolchain.py --arch x86_64 --api $API --install-dir ${TOOLCHAIN_x86_64_DIR} --stl=libc++