[compiler-rt] r362842 - [GWP-ASan] Removed unittests from Android build.

[Mitch Phillips via llvm-commits]

Author: hctim
Date: Fri Jun  7 13:56:32 2019
New Revision: 362842

URL: http://llvm.org/viewvc/llvm-project?rev=362842&view=rev
Log:
[GWP-ASan] Removed unittests from Android build.

Summary:
Longstanding issues in the Android test runner means that compiler-rt unit
tests don't work on Android due to libc++ link-time issues. Looks like the
exported libc++ from the Android NDK is x86-64, even though it's part of the
ARM[64] toolchain... See similar measures for ASan and sanitizer-common that
disable unit tests for Android.

Should fully fix the Android bots (@vlad.tsyrklevich).

Reviewers: vitalybuka

Reviewed By: vitalybuka

Subscribers: srhines, kubamracek, mgorny, javed.absar, kristof.beyls, #sanitizers, llvm-commits, vlad.tsyrklevich

Tags: #sanitizers, #llvm

Differential Revision: https://reviews.llvm.org/D63019

Modified:
    compiler-rt/trunk/test/gwp_asan/CMakeLists.txt

Modified: compiler-rt/trunk/test/gwp_asan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/gwp_asan/CMakeLists.txt?rev=362842&r1=362841&r2=362842&view=diff
==============================================================================
--- compiler-rt/trunk/test/gwp_asan/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/gwp_asan/CMakeLists.txt Fri Jun  7 13:56:32 2019
@@ -8,7 +8,12 @@ set(GWP_ASAN_TEST_DEPS
   ${SANITIZER_COMMON_LIT_TEST_DEPS}
   gwp_asan)
 
-if (COMPILER_RT_INCLUDE_TESTS)
+# Longstanding issues in the Android test runner means that compiler-rt unit
+# tests don't work on Android due to libc++ link-time issues. Looks like the
+# exported libc++ from the Android NDK is x86-64, even though it's part of the
+# ARM[64] toolchain... See similar measures for ASan and sanitizer-common that
+# disable unit tests for Android.
+if (COMPILER_RT_INCLUDE_TESTS AND COMPILER_RT_HAS_GWP_ASAN AND NOT ANDROID)
   list(APPEND GWP_ASAN_TEST_DEPS GwpAsanUnitTests)
   configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/unit/lit.site.cfg.in