commit dcef27c2adf9772eab230512524139fd7cfb12e5
author Ryan Prichard <rprichard@google.com> Mon Oct 28 13:57:32 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 28 13:57:32 2019 -0700
tree 32c1bf84cfa8fb6b314198f8fcbdfecca11ee54e
parent 0c486ca7242268e922c957a6e7b4f354f33aba79
parent 0ba1b3f2e8d4aae6c97c985efe32b6a732736564

Merge "Stop linking libdl.a into static bins" am: fe43a3f2cb am: e22800852f
am: 0ba1b3f2e8

Change-Id: If381b398740c9aef72072056913b23c348fd6fdd

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 2439f79..efb21e7 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -182,7 +182,9 @@
   my_shared_libraries += $($(LOCAL_2ND_ARCH_VAR_PREFIX)HWADDRESS_SANITIZER_RUNTIME_LIBRARY)
   ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
     ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
-      my_static_libraries := $(my_static_libraries) $($(LOCAL_2ND_ARCH_VAR_PREFIX)HWADDRESS_SANITIZER_STATIC_LIBRARY)
+      my_static_libraries := $(my_static_libraries) \
+                             $($(LOCAL_2ND_ARCH_VAR_PREFIX)HWADDRESS_SANITIZER_STATIC_LIBRARY) \
+                             libdl
     endif
   endif
 endif

core/cxx_stl_setup.mk

diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index 95b1090..6571d99 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -82,7 +82,7 @@
         endif
 
         ifeq ($(my_link_type),static)
-            my_static_libraries += libm libc libdl
+            my_static_libraries += libm libc
         endif
     endif
 else ifeq ($(my_cxx_stl),ndk)