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 | 9e922e7d246ccd887f62966711b59a2d45227c07 (patch) | |
| tree | c40801506251b9fed27223603154835f6b198b71 /compiler-rt/lib/interception | |
| parent | fc02e3c3638b75a19964e10cddbb83790b352b24 (diff) | |
| download | bcm5719-llvm-9e922e7d246ccd887f62966711b59a2d45227c07.tar.gz bcm5719-llvm-9e922e7d246ccd887f62966711b59a2d45227c07.zip | |
[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.
llvm-svn: 218605
Diffstat (limited to 'compiler-rt/lib/interception')
| -rw-r--r-- | compiler-rt/lib/interception/CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/compiler-rt/lib/interception/CMakeLists.txt b/compiler-rt/lib/interception/CMakeLists.txt index cf8b3b4f9cd..b77f2d1562b 100644 --- a/compiler-rt/lib/interception/CMakeLists.txt +++ b/compiler-rt/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}) |
