[gn build] (manually) merge e51631ca4c

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",
   ]
 

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 = ""