Merge "Cleanup ASan build implementation."

am: bf07f0085b

Change-Id: I20d65d42430fa9f8d68bac4f8863a8758c95c0e5
This commit is contained in:
Dan Albert
2019-07-22 11:29:22 -07:00
committed by android-build-merger

View File

@@ -345,9 +345,6 @@ ifneq ($(filter address,$(my_global_sanitize) $(my_sanitize)),)
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)