commit b4c796460fe5f53e327f3363a45c86b7d092965a
author Evgenii Stepanov <eugenis@google.com> Thu Jun 30 23:54:05 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 30 23:54:05 2016 +0000
tree 6e4838207afc0bbd3ed8ed41ed466c9fa96f1e78
parent 83ae8a4ca9cec88e8e4a464259976a7735e9df9c
parent 2890414f7829505e1edca4bea86ae9ad1d9122fa

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

Change-Id: I77a1824ebd28ad05ff635744e71e65259bf1e8f4

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