p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Stop linking libdl.a into static bins" 

am: fe43a3f2cb

Change-Id: I9209b793f37ac2a16294a50d2d83a0aa72134d28
This commit is contained in:
Ryan Prichard 2019-10-28 13:35:54 -07:00 committed by android-build-merger
parent 8e3afe7ca4 fe43a3f2cb
commit e22800852f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/config_sanitizers.mk
View File

@ -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

2
core/cxx_stl_setup.mk
View File

@ -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)