diff options
| -rw-r--r-- | core/config_sanitizers.mk | 4 | ||||
| -rw-r--r-- | core/cxx_stl_setup.mk | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index 2439f7962a..efb21e7c6a 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -182,7 +182,9 @@ ifneq ($(filter hwaddress,$(my_sanitize)),) 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 diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index 95b1090811..6571d99be5 100644 --- a/core/cxx_stl_setup.mk +++ b/core/cxx_stl_setup.mk @@ -82,7 +82,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) 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) |