commit a738f29d62642a38e685879c2d848fdf67d14648
author Dmitriy Ivanov <dimitry@google.com> Wed Apr 29 23:04:26 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 29 23:04:26 2015 +0000
tree c453a8632e087f4da2d98f163ea22b725a13376a
parent a022f790eb8dc96d2fe785090bca11d7afadb6db
parent fbbe8926aa1159bdcc95b5cb7fffa28948deb94a

am fbbe8926: am cb238772: Merge "Revert "Revert "Pack relocations for mips"""

* commit 'fbbe8926aa1159bdcc95b5cb7fffa28948deb94a':
  Revert "Revert "Pack relocations for mips""

core/combo/TARGET_linux-mips.mk

diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk
index b17d59a..29e49fb 100644
--- a/core/combo/TARGET_linux-mips.mk
+++ b/core/combo/TARGET_linux-mips.mk
@@ -162,6 +162,8 @@
 $(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