commit bf07f0085b205b012a171813d26090711a699483
author Dan Albert <danalbert@google.com> Mon Jul 22 18:05:10 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 22 18:05:10 2019 +0000
tree 011bed5df1505f13d3eb5e273d9e16aa0fdc82e0
parent 79da9010d5eb7c3940e833e5b196ae5a458e308f
parent a0530aa94d26fdbce687292e0d5a18979621ce76

Merge "Cleanup ASan build implementation."

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 7a9f23e..2439f79 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -345,9 +345,6 @@
       my_shared_libraries := $($(LOCAL_2ND_ARCH_VAR_PREFIX)ADDRESS_SANITIZER_RUNTIME_LIBRARY) \
                              $(my_shared_libraries)
     endif
-    ifeq (,$(filter $(LOCAL_MODULE),$(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)))
-      my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)
-    endif
 
     # Do not add unnecessary dependency in shared libraries.
     ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)