openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Add libdl.so to the list of system shared libs" am: b519d002f3 am: cd00be0767 

am: b07838c082

Change-Id: I8a5fc05538b48f8ae086e6d25b30633225f8dfc3
This commit is contained in:
Dimitry Ivanov 2017-06-29 22:25:07 +00:00 committed by android-build-merger
parent f445e283e2 b07838c082
commit 181713e34f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/binary.mk
View File

@ -24,9 +24,10 @@ ifdef LOCAL_IS_HOST_MODULE
endif
else
ifeq ($(LOCAL_SYSTEM_SHARED_LIBRARIES),none)
my_system_shared_libraries := libc libm
my_system_shared_libraries := libc libm libdl
else
my_system_shared_libraries := $(LOCAL_SYSTEM_SHARED_LIBRARIES)
my_system_shared_libraries := $(patsubst libc,libc libdl,$(my_system_shared_libraries))
endif
endif
@ -39,7 +40,7 @@ my_src_files := $(LOCAL_SRC_FILES)
my_src_files_exclude := $(LOCAL_SRC_FILES_EXCLUDE)
my_static_libraries := $(LOCAL_STATIC_LIBRARIES)
my_whole_static_libraries := $(LOCAL_WHOLE_STATIC_LIBRARIES)
my_shared_libraries := $(LOCAL_SHARED_LIBRARIES)
my_shared_libraries := $(filter-out $(my_system_shared_libraries),$(LOCAL_SHARED_LIBRARIES))
my_header_libraries := $(LOCAL_HEADER_LIBRARIES)
my_cflags := $(LOCAL_CFLAGS)
my_conlyflags := $(LOCAL_CONLYFLAGS)
@ -1362,7 +1363,7 @@ endif
ifdef LOCAL_INSTALLED_MODULE
ifdef installed_shared_library_module_names
$(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \
$(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(sort $(installed_shared_library_module_names)))
$(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(installed_shared_library_module_names))
endif
endif

2
core/cxx_stl_setup.mk
View File

@ -99,8 +99,6 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
ifeq ($(my_link_type),static)
my_static_libraries += libm libc libdl
else
my_shared_libraries += libdl
endif
endif
else ifeq ($(my_cxx_stl),ndk)