From 7ba582aec3da735e456b12eeb8351e100dead740 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 6 Aug 2015 12:22:40 -0700 Subject: [PATCH] Dedup system shared libraries. These shouldn't differ by target. Right now only mips64 does, and that's a bug. Change-Id: Ic941ede85ba1bc07d3316a55639ba71a6afc9630 --- core/binary.mk | 2 +- core/combo/TARGET_linux-arm.mk | 2 -- core/combo/TARGET_linux-arm64.mk | 2 -- core/combo/TARGET_linux-mips.mk | 2 -- core/combo/TARGET_linux-mips64.mk | 2 -- core/combo/TARGET_linux-x86.mk | 2 -- core/combo/TARGET_linux-x86_64.mk | 2 -- 7 files changed, 1 insertion(+), 13 deletions(-) diff --git a/core/binary.mk b/core/binary.mk index e18f8c8e0..96cde0c47 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -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 diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index a2d3dee31..7818e3eee 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -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 diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk index 0e4c6f1c3..863befee4 100644 --- a/core/combo/TARGET_linux-arm64.mk +++ b/core/combo/TARGET_linux-arm64.mk @@ -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 diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index 962aa4573..66461d9c1 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -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 diff --git a/core/combo/TARGET_linux-mips64.mk b/core/combo/TARGET_linux-mips64.mk index c09a491f7..7aaded5d0 100644 --- a/core/combo/TARGET_linux-mips64.mk +++ b/core/combo/TARGET_linux-mips64.mk @@ -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 diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index f6dbcb898..0b8792083 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -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_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm - $(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker $(combo_2nd_arch_prefix)TARGET_GLOBAL_YASM_FLAGS := -f elf32 -m x86 diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 7b9cd7bf1..bf443b301 100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -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_CRTEND_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o -TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm - TARGET_LINKER := /system/bin/linker64 TARGET_GLOBAL_YASM_FLAGS := -f elf64 -m amd64