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

Commit 2e4b90e5 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Dedup system shared libraries."

parents 735cd90d 7ba582ae

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ ifdef LOCAL_IS_HOST_MODULE 
  endif

else

  ifeq ($(LOCAL_SYSTEM_SHARED_LIBRARIES),none)

      my_system_shared_libraries := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES)

      my_system_shared_libraries := libc libm

  else

      my_system_shared_libraries := $(LOCAL_SYSTEM_SHARED_LIBRARIES)

  endif

core/combo/TARGET_linux-arm.mk

+0 −2
Original line number Diff line number Diff line
@@ -190,6 +190,4 @@ $(combo_2nd_arch_prefix)TARGET_CRTEND_SO_O := $($(combo_2nd_arch_prefix)TARGET_O 


$(combo_2nd_arch_prefix)TARGET_PACK_MODULE_RELOCATIONS := true



$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm



$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker

core/combo/TARGET_linux-arm64.mk

+0 −2
Original line number Diff line number Diff line
@@ -161,6 +161,4 @@ TARGET_CRTEND_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o 


TARGET_PACK_MODULE_RELOCATIONS := true



TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm



TARGET_LINKER := /system/bin/linker64

core/combo/TARGET_linux-mips.mk

+0 −2
Original line number Diff line number Diff line
@@ -164,6 +164,4 @@ $(combo_2nd_arch_prefix)TARGET_CRTEND_SO_O := $($(combo_2nd_arch_prefix)TARGET_O 


$(combo_2nd_arch_prefix)TARGET_PACK_MODULE_RELOCATIONS := true



$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm



$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker

core/combo/TARGET_linux-mips64.mk

+0 −2
Original line number Diff line number Diff line
@@ -173,6 +173,4 @@ TARGET_CRTEND_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o 


TARGET_PACK_MODULE_RELOCATIONS := true



TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm



TARGET_LINKER := /system/bin/linker64