[PATCH] D71079: gn build: Bump Android API level to 29, and NDK to r21.

[Peter Collingbourne via Phabricator via llvm-commits]

pcc created this revision.
pcc added reviewers: thakis, phosek.
Herald added a subscriber: srhines.
Herald added a project: LLVM.
pcc added a child revision: D71081: gn build: Add support for building scudo and its unit tests..

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


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D71079

Files:
  llvm/utils/gn/build/toolchain/compiler.gni
  llvm/utils/gn/secondary/llvm/triples.gni


Index: llvm/utils/gn/secondary/llvm/triples.gni
===================================================================
--- llvm/utils/gn/secondary/llvm/triples.gni
+++ llvm/utils/gn/secondary/llvm/triples.gni
@@ -14,11 +14,11 @@
   }
 } 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") {
Index: llvm/utils/gn/build/toolchain/compiler.gni
===================================================================
--- llvm/utils/gn/build/toolchain/compiler.gni
+++ llvm/utils/gn/build/toolchain/compiler.gni
@@ -10,7 +10,7 @@
   # 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 = ""
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D71079.232400.patch
Type: text/x-patch
Size: 1212 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191205/fd0e67aa/attachment.bin>