summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorKostya Kortchinsky <kostyak@google.com>2017-09-18 15:40:53 +0000
committerKostya Kortchinsky <kostyak@google.com>2017-09-18 15:40:53 +0000
commitf951abe9908d2034b99e579e8b88afab5b7a7d24 (patch)
treee69d81ab90a95ae20276276cf54a09c922845442 /cmake
parent5de033a80d0b6343cd648ff41cddd26b673c19c4 (diff)
[scudo] Android build support
Summary: Mark Android as supported in the cmake configuration for Scudo. Scudo is not added yet in the Android build bots, but code builds and tests pass locally. It is for a later CL. I also checked that Scudo builds as part of the Android toolchain. A few modifications had to be made: - Android defaults to `abort_on_error=1`, which doesn't work well with the current tests. So change the default way to pass `SCUDO_OPTIONS` to the tests to account for this, setting it to 0 by default; - Disable the `valloc.cpp` & `random_shuffle.cpp` tests on Android; - There is a bit of gymnatic to be done with the `SCUDO_TEST_TARGET_ARCH` string, due to android using the `-android` suffix, and `i686` instead of `i386`; - Android doesn't need `-lrt`. Reviewers: alekseyshl, eugenis Reviewed By: alekseyshl Subscribers: srhines, mgorny, llvm-commits Differential Revision: https://reviews.llvm.org/D37907 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@313538 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rw-r--r--cmake/config-ix.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 5820946df..2c395c0fe 100644
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -574,7 +574,7 @@ else()
endif()
if (COMPILER_RT_HAS_SANITIZER_COMMON AND SCUDO_SUPPORTED_ARCH AND
- OS_NAME MATCHES "Linux")
+ OS_NAME MATCHES "Linux|Android")
set(COMPILER_RT_HAS_SCUDO TRUE)
else()
set(COMPILER_RT_HAS_SCUDO FALSE)