tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add libdl.so to the list of system shared libs"

Browse source 
am: b519d002f3

Change-Id: I2d3d5daf26b7a78d68c02cf961bf43a71f19b0bf
This commit is contained in:
Dimitry Ivanov 2017-06-29 22:17:04 +00:00 committed by android-build-merger
commit cd00be0767
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 endif
else else
ifeq ($(LOCAL_SYSTEM_SHARED_LIBRARIES),none) ifeq ($(LOCAL_SYSTEM_SHARED_LIBRARIES),none)
my_system_shared_libraries := libc libm my_system_shared_libraries := libc libm libdl
else else
my_system_shared_libraries := $(LOCAL_SYSTEM_SHARED_LIBRARIES) my_system_shared_libraries := $(LOCAL_SYSTEM_SHARED_LIBRARIES)
my_system_shared_libraries := $(patsubst libc,libc libdl,$(my_system_shared_libraries))
endif endif
endif endif
@ -39,7 +40,7 @@ my_src_files := $(LOCAL_SRC_FILES)
my_src_files_exclude := $(LOCAL_SRC_FILES_EXCLUDE) my_src_files_exclude := $(LOCAL_SRC_FILES_EXCLUDE)
my_static_libraries := $(LOCAL_STATIC_LIBRARIES) my_static_libraries := $(LOCAL_STATIC_LIBRARIES)
my_whole_static_libraries := $(LOCAL_WHOLE_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_header_libraries := $(LOCAL_HEADER_LIBRARIES)
my_cflags := $(LOCAL_CFLAGS) my_cflags := $(LOCAL_CFLAGS)
my_conlyflags := $(LOCAL_CONLYFLAGS) my_conlyflags := $(LOCAL_CONLYFLAGS)
@ -1362,7 +1363,7 @@ endif
ifdef LOCAL_INSTALLED_MODULE ifdef LOCAL_INSTALLED_MODULE
ifdef installed_shared_library_module_names ifdef installed_shared_library_module_names
$(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \ $(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
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) ifeq ($(my_link_type),static)
my_static_libraries += libm libc libdl my_static_libraries += libm libc libdl
else
my_shared_libraries += libdl
endif endif
endif endif
else ifeq ($(my_cxx_stl),ndk) else ifeq ($(my_cxx_stl),ndk)