maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

gn build: Bump Android API level to 29, and NDK to r21. 

These are both necessary in order to use ELF TLS, which is needed
by the scudo unit tests.

Differential Revision: https://reviews.llvm.org/D71079
This commit is contained in:
Peter Collingbourne 2019-11-19 14:40:21 -08:00
parent 8267be2995
commit b3516a0d4a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/utils/gn/build/toolchain/compiler.gni
View File

@ -10,7 +10,7 @@ declare_args() {
# Example value: getenv("HOME") + "/src/llvm-build/Release+Asserts"
clang_base_path = ""
# Set this to the path to Android NDK r19. If set, cross compilation targeting
# Set this to the path to Android NDK r21. If set, cross compilation targeting
# Android will be enabled.
android_ndk_path = ""
}

4
llvm/utils/gn/secondary/llvm/triples.gni
View File

@ -14,11 +14,11 @@ if (current_cpu == "x86") {
}
} else if (current_cpu == "arm") {
if (current_os == "android") {
llvm_current_triple = "arm-linux-androideabi"
llvm_current_triple = "arm-linux-androideabi29"
}
} else if (current_cpu == "arm64") {
if (current_os == "android") {
llvm_current_triple = "aarch64-linux-android21"
llvm_current_triple = "aarch64-linux-android29"
}
} else if (current_cpu == "ppc64") {
if (current_os == "linux") {