diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-04-24 21:09:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 21:09:38 +0000 |
| commit | a705b5651d91592ba564e3e237044f3b649f6b82 (patch) | |
| tree | a17b4ef5053349283c316f78f83fc1d7cc8296d6 /core/combo | |
| parent | d96e487b9bbeac8e08a00d64507534dad3e9e5a8 (diff) | |
| parent | 10537b6f41342c50fc0c80bd85ff1b126054086f (diff) | |
| download | build-a705b5651d91592ba564e3e237044f3b649f6b82.zip build-a705b5651d91592ba564e3e237044f3b649f6b82.tar.gz build-a705b5651d91592ba564e3e237044f3b649f6b82.tar.bz2 | |
am 10537b6f: am 513be561: am cae46525: am 691a4379: Merge "Pack relocations for mips"
* commit '10537b6f41342c50fc0c80bd85ff1b126054086f':
Pack relocations for mips
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/TARGET_linux-mips.mk | 2 |
1 files changed, 2 insertions, 0 deletions
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_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 |