From c0538938c9323fb99114e2ad0305ad7a740cd0ec Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis@chromium.org>
Date: Sat, 14 Nov 2020 10:12:01 -0500
Subject: [PATCH] [gn build] (manually) merge e51631ca4cf

---
 llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn | 1 +
 llvm/utils/gn/secondary/compiler-rt/test/test.gni | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
index 72c9103e7bca..5cbfaf392b96 100644
--- a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
@@ -55,6 +55,7 @@ write_cmake_config("lit_common_configured") {
     "COMPILER_RT_HAS_LLD_PYBOOL=True",
     "COMPILER_RT_HAS_GWP_ASAN_PYBOOL=False",
     "HAVE_RPC_XDR_H=0",
+    "ANDROID_API_LEVEL=$android_api_level",
     "ANDROID_SERIAL_FOR_TESTING=$android_serial_for_testing",
   ]
 
diff --git a/llvm/utils/gn/secondary/compiler-rt/test/test.gni b/llvm/utils/gn/secondary/compiler-rt/test/test.gni
index e2335933659f..72d5bc202fbc 100644
--- a/llvm/utils/gn/secondary/compiler-rt/test/test.gni
+++ b/llvm/utils/gn/secondary/compiler-rt/test/test.gni
@@ -3,6 +3,9 @@ import("//llvm/utils/gn/build/toolchain/target_flags.gni")
 declare_args() {
   # Specifies the serial number of the Android device to be used for testing.
   android_serial_for_testing = ""
+
+  # Android API level used in compiler-rt tests.
+  android_api_level = 29
 }
 
 target_flags_string = ""