Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7817c2b2 authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by android-build-merger
Browse files

Merge "Add libdl.so to the list of system shared libs" am: b519d002 am: cd00be07 am: b07838c0 

am: 181713e3

Change-Id: Ib3846df71ea350c5c7ef13045070fddd2a83e648
parents 82f6d940 181713e3

core/binary.mk

+4 −3
Original line number Diff line number Diff line
@@ -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

core/cxx_stl_setup.mk

+0 −2
Original line number Diff line number Diff line
@@ -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)