Skip to content

Commit 4b17d5d

Browse files
committed
Update Android API.
1 parent 4a2e69f commit 4b17d5d

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed

builds/posix/make.android.arm64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ endif
66

77
NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
88

9-
CROSS_PREFIX24:=$(NDK_TOOLCHAIN)/bin/aarch64-linux-android24-
9+
CROSS_PREFIX29:=$(NDK_TOOLCHAIN)/bin/aarch64-linux-android29-
1010
CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
1111

1212
CROSS_FLAGS:=-I$(ROOT)/gen/cross
1313

14-
CXX:=$(CROSS_PREFIX24)clang++
15-
CC:=$(CROSS_PREFIX24)clang
14+
CXX:=$(CROSS_PREFIX29)clang++
15+
CC:=$(CROSS_PREFIX29)clang
1616
AR:=$(CROSS_PREFIX)ar
1717
AS:=$(CROSS_PREFIX)as
1818
LD:=$(CROSS_PREFIX)ld

builds/posix/make.android.arme

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ endif
66

77
NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
88

9-
CROSS_PREFIX24:=$(NDK_TOOLCHAIN)/bin/armv7a-linux-androideabi24-
9+
CROSS_PREFIX29:=$(NDK_TOOLCHAIN)/bin/armv7a-linux-androideabi29-
1010
CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
1111

1212
CROSS_FLAGS:=-I$(ROOT)/gen/cross
1313

14-
CXX:=$(CROSS_PREFIX24)clang++
15-
CC:=$(CROSS_PREFIX24)clang
14+
CXX:=$(CROSS_PREFIX29)clang++
15+
CC:=$(CROSS_PREFIX29)clang
1616
AR:=$(CROSS_PREFIX)ar
1717
AS:=$(CROSS_PREFIX)as
1818
LD:=$(CROSS_PREFIX)ld

builds/posix/make.android.x86

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ endif
66

77
NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
88

9-
CROSS_PREFIX24:=$(NDK_TOOLCHAIN)/bin/i686-linux-android24-
9+
CROSS_PREFIX29:=$(NDK_TOOLCHAIN)/bin/i686-linux-android29-
1010
CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
1111

1212
CROSS_FLAGS:=-I$(ROOT)/gen/cross
1313

14-
CXX:=$(CROSS_PREFIX24)clang++
15-
CC:=$(CROSS_PREFIX24)clang
14+
CXX:=$(CROSS_PREFIX29)clang++
15+
CC:=$(CROSS_PREFIX29)clang
1616
AR:=$(CROSS_PREFIX)ar
1717
AS:=$(CROSS_PREFIX)as
1818
LD:=$(CROSS_PREFIX)ld

builds/posix/make.android.x86_64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ endif
66

77
NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
88

9-
CROSS_PREFIX24:=$(NDK_TOOLCHAIN)/bin/x86_64-linux-android24-
9+
CROSS_PREFIX29:=$(NDK_TOOLCHAIN)/bin/x86_64-linux-android29-
1010
CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
1111

1212
CROSS_FLAGS:=-I$(ROOT)/gen/cross
1313

14-
CXX:=$(CROSS_PREFIX24)clang++
15-
CC:=$(CROSS_PREFIX24)clang
14+
CXX:=$(CROSS_PREFIX29)clang++
15+
CC:=$(CROSS_PREFIX29)clang
1616
AR:=$(CROSS_PREFIX)ar
1717
AS:=$(CROSS_PREFIX)as
1818
LD:=$(CROSS_PREFIX)ld

extern/icu/android/aarch64/config.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
CFLAGS='-Os' \
2121
CXXFLAGS='--std=c++17' \
2222
LDFLAGS='-static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
23-
CC=aarch64-linux-android24-clang \
24-
CXX=aarch64-linux-android24-clang++ \
23+
CC=aarch64-linux-android29-clang \
24+
CXX=aarch64-linux-android29-clang++ \
2525
AR=llvm-ar \
2626
RANLIB=llvm-ranlib \
2727
--with-data-packaging=archive

extern/icu/android/armv7a/config.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
CFLAGS='-Os -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
2121
CXXFLAGS='--std=c++17 -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
2222
LDFLAGS='-static-libstdc++ -march=armv7-a -Wl,--fix-cortex-a8 -Wl,-rpath=\$$ORIGIN' \
23-
CC=armv7a-linux-androideabi24-clang \
24-
CXX=armv7a-linux-androideabi24-clang++ \
23+
CC=armv7a-linux-androideabi29-clang \
24+
CXX=armv7a-linux-androideabi29-clang++ \
2525
AR=llvm-ar \
2626
RANLIB=llvm-ranlib \
2727
--with-data-packaging=archive

extern/icu/android/i686/config.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
CFLAGS='-Os' \
2121
CXXFLAGS='--std=c++17' \
2222
LDFLAGS='-static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
23-
CC=i686-linux-android24-clang \
24-
CXX=i686-linux-android24-clang++ \
23+
CC=i686-linux-android29-clang \
24+
CXX=i686-linux-android29-clang++ \
2525
AR=llvm-ar \
2626
RANLIB=llvm-ranlib \
2727
--with-data-packaging=archive

extern/icu/android/x86_64/config.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
CFLAGS='-Os' \
2121
CXXFLAGS='--std=c++17' \
2222
LDFLAGS='-static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
23-
CC=x86_64-linux-android24-clang \
24-
CXX=x86_64-linux-android24-clang++ \
23+
CC=x86_64-linux-android29-clang \
24+
CXX=x86_64-linux-android29-clang++ \
2525
AR=llvm-ar \
2626
RANLIB=llvm-ranlib \
2727
--with-data-packaging=archive

0 commit comments

Comments
 (0)