summaryrefslogtreecommitdiffstats
path: root/core/combo
diff options
context:
space:
mode:
authorDimitry Ivanov <dimitry@google.com>2015-04-29 19:37:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-29 19:37:46 +0000
commit8fb3350f1a2ed07f10bba55cb67da9e0a0998b20 (patch)
tree3d81c9c030640f55cc0df92bd953be7429aaae13 /core/combo
parent3e037e36d0b73b5078bf5b45087bea34b673153c (diff)
parentd896883bfe6a0777dd4cb782792230a36346a9fe (diff)
downloadbuild-8fb3350f1a2ed07f10bba55cb67da9e0a0998b20.zip
build-8fb3350f1a2ed07f10bba55cb67da9e0a0998b20.tar.gz
build-8fb3350f1a2ed07f10bba55cb67da9e0a0998b20.tar.bz2
Merge "Revert "Pack relocations for mips"" into mnc-dev
Diffstat (limited to 'core/combo')
-rw-r--r--core/combo/TARGET_linux-mips.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk
index 29e49fb..b17d59a 100644
--- a/core/combo/TARGET_linux-mips.mk
+++ b/core/combo/TARGET_linux-mips.mk
@@ -162,8 +162,6 @@ $(combo_2nd_arch_prefix)TARGET_CRTEND_O := $($(combo_2nd_arch_prefix)TARGET_OUT_
$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_SO_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
$(combo_2nd_arch_prefix)TARGET_CRTEND_SO_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.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