Skip to content

Commit 64a010e

Browse files
robertyingrobertying
committed
Update min sdk to 23 & update NDK to 23
1 parent e33bb4f commit 64a010e

File tree

3 files changed

+51
-36
lines changed

3 files changed

+51
-36
lines changed

‎build-curl.sh

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ autoreconf -fi
2222
# arm64
2323
export TARGET_HOST=aarch64-linux-android
2424
export ANDROID_ARCH=arm64-v8a
25-
export AR=$TOOLCHAIN/bin/$TARGET_HOST-ar
26-
export AS=$TOOLCHAIN/bin/$TARGET_HOST-as
25+
export AR=$TOOLCHAIN/bin/llvm-ar
2726
export CC=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang
27+
export AS=$CC
2828
export CXX=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang++
29-
export LD=$TOOLCHAIN/bin/$TARGET_HOST-ld
30-
export RANLIB=$TOOLCHAIN/bin/$TARGET_HOST-ranlib
31-
export STRIP=$TOOLCHAIN/bin/$TARGET_HOST-strip
29+
export LD=$TOOLCHAIN/bin/ld
30+
export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
31+
export STRIP=$TOOLCHAIN/bin/llvm-strip
3232
export SSL_DIR=$PWD/../openssl/build/$ANDROID_ARCH
3333

3434
./configure --host=$TARGET_HOST \
@@ -45,15 +45,13 @@ cp -R $PWD/build/$ANDROID_ARCH ../build/curl/
4545
# arm
4646
export TARGET_HOST=armv7a-linux-androideabi
4747
export ANDROID_ARCH=armeabi-v7a
48-
49-
# for 32-bit ARM, the compiler is prefixed with armv7a-linux-androideabi, but the binutils tools are prefixed with arm-linux-androideabi
50-
export AR=$TOOLCHAIN/bin/arm-linux-androideabi-ar
51-
export AS=$TOOLCHAIN/bin/arm-linux-androideabi-as
48+
export AR=$TOOLCHAIN/bin/llvm-ar
5249
export CC=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang
50+
export AS=$CC
5351
export CXX=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang++
54-
export LD=$TOOLCHAIN/bin/arm-linux-androideabi-ld
55-
export RANLIB=$TOOLCHAIN/bin/arm-linux-androideabi-ranlib
56-
export STRIP=$TOOLCHAIN/bin/arm-linux-androideabi-strip
52+
export LD=$TOOLCHAIN/bin/ld
53+
export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
54+
export STRIP=$TOOLCHAIN/bin/llvm-strip
5755
export SSL_DIR=$PWD/../openssl/build/$ANDROID_ARCH
5856

5957
./configure --host=$TARGET_HOST \
@@ -70,13 +68,13 @@ cp -R $PWD/build/$ANDROID_ARCH ../build/curl/
7068
# x86
7169
export TARGET_HOST=i686-linux-android
7270
export ANDROID_ARCH=x86
73-
export AR=$TOOLCHAIN/bin/$TARGET_HOST-ar
74-
export AS=$TOOLCHAIN/bin/$TARGET_HOST-as
71+
export AR=$TOOLCHAIN/bin/llvm-ar
7572
export CC=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang
73+
export AS=$CC
7674
export CXX=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang++
77-
export LD=$TOOLCHAIN/bin/$TARGET_HOST-ld
78-
export RANLIB=$TOOLCHAIN/bin/$TARGET_HOST-ranlib
79-
export STRIP=$TOOLCHAIN/bin/$TARGET_HOST-strip
75+
export LD=$TOOLCHAIN/bin/ld
76+
export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
77+
export STRIP=$TOOLCHAIN/bin/llvm-strip
8078
export SSL_DIR=$PWD/../openssl/build/$ANDROID_ARCH
8179

8280
./configure --host=$TARGET_HOST \
@@ -93,13 +91,13 @@ cp -R $PWD/build/$ANDROID_ARCH ../build/curl/
9391
# x64
9492
export TARGET_HOST=x86_64-linux-android
9593
export ANDROID_ARCH=x86_64
96-
export AR=$TOOLCHAIN/bin/$TARGET_HOST-ar
97-
export AS=$TOOLCHAIN/bin/$TARGET_HOST-as
94+
export AR=$TOOLCHAIN/bin/llvm-ar
9895
export CC=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang
96+
export AS=$CC
9997
export CXX=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang++
100-
export LD=$TOOLCHAIN/bin/$TARGET_HOST-ld
101-
export RANLIB=$TOOLCHAIN/bin/$TARGET_HOST-ranlib
102-
export STRIP=$TOOLCHAIN/bin/$TARGET_HOST-strip
98+
export LD=$TOOLCHAIN/bin/ld
99+
export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
100+
export STRIP=$TOOLCHAIN/bin/llvm-strip
103101
export SSL_DIR=$PWD/../openssl/build/$ANDROID_ARCH
104102

105103
./configure --host=$TARGET_HOST \

‎build-openssl.sh

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ fi
88

99
export TOOLCHAIN=$NDK/toolchains/llvm/prebuilt/$HOST_TAG
1010

11-
# openssl refers to the host specific toolchain as "ANDROID_NDK_HOME"
12-
export ANDROID_NDK_HOME=$TOOLCHAIN
11+
export ANDROID_NDK_HOME=$NDK
1312
PATH=$TOOLCHAIN/bin:$PATH
1413

1514
mkdir -p build/openssl
@@ -18,9 +17,13 @@ cd openssl
1817
# arm64
1918
export TARGET_HOST=aarch64-linux-android
2019
export ANDROID_ARCH=arm64-v8a
21-
22-
# openssl does not handle api suffix well
23-
ln -sfn $TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang $TOOLCHAIN/bin/$TARGET_HOST-clang
20+
export AR=$TOOLCHAIN/bin/llvm-ar
21+
export CC=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang
22+
export AS=$CC
23+
export CXX=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang++
24+
export LD=$TOOLCHAIN/bin/ld
25+
export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
26+
export STRIP=$TOOLCHAIN/bin/llvm-strip
2427

2528
./Configure android-arm64 no-shared \
2629
-D__ANDROID_API__=$MIN_SDK_VERSION \
@@ -35,9 +38,13 @@ cp -R $PWD/build/$ANDROID_ARCH ../build/openssl/
3538
# arm
3639
export TARGET_HOST=arm-linux-androideabi
3740
export ANDROID_ARCH=armeabi-v7a
38-
39-
# for 32-bit ARM, the compiler is prefixed with armv7a-linux-androideabi, but the binutils tools are prefixed with arm-linux-androideabi
40-
ln -sfn $TOOLCHAIN/bin/armv7a-linux-androideabi$MIN_SDK_VERSION-clang $TOOLCHAIN/bin/$TARGET_HOST-clang
41+
export AR=$TOOLCHAIN/bin/llvm-ar
42+
export CC=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang
43+
export AS=$CC
44+
export CXX=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang++
45+
export LD=$TOOLCHAIN/bin/ld
46+
export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
47+
export STRIP=$TOOLCHAIN/bin/llvm-strip
4148

4249
./Configure android-arm no-shared \
4350
-D__ANDROID_API__=$MIN_SDK_VERSION \
@@ -52,8 +59,13 @@ cp -R $PWD/build/$ANDROID_ARCH ../build/openssl/
5259
# x86
5360
export TARGET_HOST=i686-linux-android
5461
export ANDROID_ARCH=x86
55-
56-
ln -sfn $TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang $TOOLCHAIN/bin/$TARGET_HOST-clang
62+
export AR=$TOOLCHAIN/bin/llvm-ar
63+
export CC=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang
64+
export AS=$CC
65+
export CXX=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang++
66+
export LD=$TOOLCHAIN/bin/ld
67+
export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
68+
export STRIP=$TOOLCHAIN/bin/llvm-strip
5769

5870
./Configure android-x86 no-shared \
5971
-D__ANDROID_API__=$MIN_SDK_VERSION \
@@ -68,8 +80,13 @@ cp -R $PWD/build/$ANDROID_ARCH ../build/openssl/
6880
# x64
6981
export TARGET_HOST=x86_64-linux-android
7082
export ANDROID_ARCH=x86_64
71-
72-
ln -sfn $TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang $TOOLCHAIN/bin/$TARGET_HOST-clang
83+
export AR=$TOOLCHAIN/bin/llvm-ar
84+
export CC=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang
85+
export AS=$CC
86+
export CXX=$TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang++
87+
export LD=$TOOLCHAIN/bin/ld
88+
export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
89+
export STRIP=$TOOLCHAIN/bin/llvm-strip
7390

7491
./Configure android-x86_64 no-shared \
7592
-D__ANDROID_API__=$MIN_SDK_VERSION \

‎my-build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22

3-
export NDK=$HOME/Library/Android/sdk/ndk/22.1.7171670
3+
export NDK=$HOME/Library/Android/sdk/ndk/23.0.7599858
44
export HOST_TAG=darwin-x86_64
5-
export MIN_SDK_VERSION=21
5+
export MIN_SDK_VERSION=23
66

77
export CFLAGS="-Os"
88
export LDFLAGS="-Wl,-Bsymbolic"

0 commit comments

Comments
 (0)