[gn build] (manually) merge e51631ca4c

This commit is contained in:
Nico Weber 2020-11-14 10:12:01 -05:00
parent 54f9ee3341
commit c0538938c9
2 changed files with 4 additions and 0 deletions

View File

@ -55,6 +55,7 @@ write_cmake_config("lit_common_configured") {
"COMPILER_RT_HAS_LLD_PYBOOL=True", "COMPILER_RT_HAS_LLD_PYBOOL=True",
"COMPILER_RT_HAS_GWP_ASAN_PYBOOL=False", "COMPILER_RT_HAS_GWP_ASAN_PYBOOL=False",
"HAVE_RPC_XDR_H=0", "HAVE_RPC_XDR_H=0",
"ANDROID_API_LEVEL=$android_api_level",
"ANDROID_SERIAL_FOR_TESTING=$android_serial_for_testing", "ANDROID_SERIAL_FOR_TESTING=$android_serial_for_testing",
] ]

View File

@ -3,6 +3,9 @@ import("//llvm/utils/gn/build/toolchain/target_flags.gni")
declare_args() { declare_args() {
# Specifies the serial number of the Android device to be used for testing. # Specifies the serial number of the Android device to be used for testing.
android_serial_for_testing = "" android_serial_for_testing = ""
# Android API level used in compiler-rt tests.
android_api_level = 29
} }
target_flags_string = "" target_flags_string = ""