diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-04-29 15:34:21 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2015-04-29 23:11:03 -0700 |
| commit | 5924f142cc813e4e7763432f85aa000adf048d24 (patch) | |
| tree | 6ba0ed8e68a4bb57c2e18d847c68ac4678c5b839 /core/combo | |
| parent | 0cabfed78e3ad4431cfadbbd90915f6b3398ed18 (diff) | |
| download | build-5924f142cc813e4e7763432f85aa000adf048d24.zip build-5924f142cc813e4e7763432f85aa000adf048d24.tar.gz build-5924f142cc813e4e7763432f85aa000adf048d24.tar.bz2 | |
Revert "Revert "Pack relocations for mips64""
This reverts commit 6399dcce598c2ac54bd87bc754028513405c049f.
Bug: http://b/20658994
(cherry picked from commit 8387d99ec3649390f815d447a44674fc9ca18823)
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/TARGET_linux-mips64.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/combo/TARGET_linux-mips64.mk b/core/combo/TARGET_linux-mips64.mk index 82ce11d..b34b7a6 100644 --- a/core/combo/TARGET_linux-mips64.mk +++ b/core/combo/TARGET_linux-mips64.mk @@ -169,6 +169,8 @@ 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_PACK_MODULE_RELOCATIONS := true + TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm TARGET_LINKER := /system/bin/linker64 |