diff options
author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-09-29 13:18:55 +0000 |
---|---|---|
committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-09-29 13:18:55 +0000 |
commit | 44014739f2d5d33a9030f68b4621b29b7dbf88ab (patch) | |
tree | 62044714609894a5a3af05634b6a65c0e3456274 /lib/interception | |
parent | 8cf642b8dac6eefa2c707a67dea810629aa13e10 (diff) |
[sanitizer] Android build cleanup.
* Detect Android toolchain target arch and set correct runtime library name.
* Merged a lot of Android and non-Android code paths.
* Android is only supported in standalone build of compiler-rt now.
* Linking lsan-common in ASan-Android (makes lsan annotations work).
* Relying on -fsanitize=address linker flag when building tests (again,
unification with non-Android path).
* Runtime library moved from lib/asan to lib/linux.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@218605 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/interception')
-rw-r--r-- | lib/interception/CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/interception/CMakeLists.txt b/lib/interception/CMakeLists.txt index cf8b3b4f9..b77f2d156 100644 --- a/lib/interception/CMakeLists.txt +++ b/lib/interception/CMakeLists.txt @@ -20,10 +20,6 @@ if(APPLE) SOURCES ${INTERCEPTION_SOURCES} CFLAGS ${INTERCEPTION_CFLAGS}) endforeach() -elseif(ANDROID) - add_library(RTInterception.arm.android OBJECT ${INTERCEPTION_SOURCES}) - set_target_compile_flags(RTInterception.arm.android - ${INTERCEPTION_CFLAGS}) else() # Otherwise, build separate libraries for each target. foreach(arch ${SANITIZER_COMMON_SUPPORTED_ARCH}) |