StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2e4b90e5: Merge "Dedup system shared libraries."

Browse Source 
* commit '2e4b90e5f152a964011bb621ee6112bee778d436':
  Dedup system shared libraries.
This commit is contained in:
Dan Albert
2015-08-06 21:34:24 +00:00
committed by Android Git Automerger
parent 849bf82079 2e4b90e5f1
commit 100422b231
7 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/binary.mk
View File

@@ -24,7 +24,7 @@ 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 := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES) my_system_shared_libraries := libc libm
else else
my_system_shared_libraries := $(LOCAL_SYSTEM_SHARED_LIBRARIES) my_system_shared_libraries := $(LOCAL_SYSTEM_SHARED_LIBRARIES)
endif endif

2
core/combo/TARGET_linux-arm.mk
View File

@@ -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_PACK_MODULE_RELOCATIONS := true
$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm
$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker $(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker

2
core/combo/TARGET_linux-arm64.mk
View File

@@ -161,6 +161,4 @@ TARGET_CRTEND_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
TARGET_PACK_MODULE_RELOCATIONS := true TARGET_PACK_MODULE_RELOCATIONS := true
TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm
TARGET_LINKER := /system/bin/linker64 TARGET_LINKER := /system/bin/linker64

2
core/combo/TARGET_linux-mips.mk
View File

@@ -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_PACK_MODULE_RELOCATIONS := true
$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm
$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker $(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker

2
core/combo/TARGET_linux-mips64.mk
View File

@@ -173,6 +173,4 @@ TARGET_CRTEND_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
TARGET_PACK_MODULE_RELOCATIONS := true TARGET_PACK_MODULE_RELOCATIONS := true
TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm
TARGET_LINKER := /system/bin/linker64 TARGET_LINKER := /system/bin/linker64

2
core/combo/TARGET_linux-x86.mk
View File

@@ -144,8 +144,6 @@ $(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_PACK_MODULE_RELOCATIONS := true
$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm
$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker $(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker
$(combo_2nd_arch_prefix)TARGET_GLOBAL_YASM_FLAGS := -f elf32 -m x86 $(combo_2nd_arch_prefix)TARGET_GLOBAL_YASM_FLAGS := -f elf32 -m x86

2
core/combo/TARGET_linux-x86_64.mk
View File

@@ -151,8 +151,6 @@ TARGET_CRTEND_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o
TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
TARGET_CRTEND_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o TARGET_CRTEND_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm
TARGET_LINKER := /system/bin/linker64 TARGET_LINKER := /system/bin/linker64
TARGET_GLOBAL_YASM_FLAGS := -f elf64 -m amd64 TARGET_GLOBAL_YASM_FLAGS := -f elf64 -m amd64