commit 0cabfed78e3ad4431cfadbbd90915f6b3398ed18
author Dmitriy Ivanov <dimitry@google.com> Wed Apr 29 14:50:05 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Wed Apr 29 15:44:20 2015 -0700
tree 4827dccd27a8a823b13fa832a7ab3a7e85ef39b7
parent 8fb3350f1a2ed07f10bba55cb67da9e0a0998b20

Revert "Revert "Pack relocations for mips""

This reverts commit d05fd6fc821db3e09c988370c6ac24c3354232f7.

Bug: http://b/20658994
Change-Id: Iccbd4846b310306ed11b87f4566b8aaadfa63ebb
(cherry picked from commit cb2b3d47addad6b7370df4b8aa77a53f98045cfb)

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