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

diff --git a/llvm/utils/gn/build/toolchain/compiler.gni b/llvm/utils/gn/build/toolchain/compiler.gni
index 37ad1f5..572fa22 100644 (file)
--- a/llvm/utils/gn/build/toolchain/compiler.gni
+++ b/llvm/utils/gn/build/toolchain/compiler.gni
@@ -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 = ""
 }

diff --git a/llvm/utils/gn/secondary/llvm/triples.gni b/llvm/utils/gn/secondary/llvm/triples.gni
index 9c9ba13..c6bef4b 100644 (file)
--- a/llvm/utils/gn/secondary/llvm/triples.gni
+++ b/llvm/utils/gn/secondary/llvm/triples.gni
@@ -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") {