[asan] Fix lit tests setup on Android.

Pass cflags in a way that's compatible with standalone compiler-rt build.

llvm-svn: 210256

diff --git a/compiler-rt/test/asan/CMakeLists.txt b/compiler-rt/test/asan/CMakeLists.txt
index b20502a..2b56996 100644 (file)
--- a/compiler-rt/test/asan/CMakeLists.txt
+++ b/compiler-rt/test/asan/CMakeLists.txt
@@ -6,12 +6,12 @@ if(CAN_TARGET_arm_android)
   # This is only true if we are cross-compiling.
   # Build all tests with host compiler and use host tools.
   set(ASAN_TEST_TARGET_CC ${CMAKE_C_COMPILER})
+  set(ASAN_TEST_TARGET_CFLAGS ${COMPILER_RT_TEST_COMPILER_CFLAGS})
   get_filename_component(ASAN_TEST_LLVM_TOOLS_DIR ${CMAKE_C_COMPILER} PATH)
   set(ASAN_TEST_CONFIG_SUFFIX "-arm-android")
   set(ASAN_TEST_BITS "32")
   set(ASAN_TEST_DYNAMIC True)
   set(ASAN_TEST_TARGET_ARCH "arm-android")
-  get_target_flags_for_arch(arm_android ASAN_TEST_TARGET_CFLAGS)
   configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
     ${CMAKE_CURRENT_BINARY_DIR}/ARMAndroidConfig/lit.site.cfg