commit 2890414f7829505e1edca4bea86ae9ad1d9122fa
author Evgenii Stepanov <eugenis@google.com> Thu Jun 30 23:50:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 30 23:50:50 2016 +0000
tree 6e4838207afc0bbd3ed8ed41ed466c9fa96f1e78
parent e6350dfdddc0ce9cc1a62d01782ae48ffba74f64
parent 3d8ee8896b39e0b1cd9e780a26d92dd6aec4b5ea

Merge \"Only add libdl dependency for ASan/TSan on target.\"
am: 3d8ee8896b

Change-Id: I97e2daed8c10a325e27969c2fcaac1848dfefa80

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 26dbb73..6b18be5 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -101,7 +101,9 @@
       my_cflags += -fsanitize-trap=all
       my_cflags += -ftrap-function=abort
     endif
-    my_shared_libraries += libdl
+    ifneq ($(filter address thread,$(my_sanitize)),)
+      my_shared_libraries += libdl
+    endif
   endif
 endif