diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-04-24 18:28:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 18:28:05 +0000 |
| commit | d96e487b9bbeac8e08a00d64507534dad3e9e5a8 (patch) | |
| tree | d15b633965abb530b25c9a931dd40fe7cbb4ac88 /core/combo | |
| parent | 7fa5ba1d22306fc07b9a35f5f76f731f793a1401 (diff) | |
| parent | 5754ad7ead23fb613f9fe4de2970283d18141ea5 (diff) | |
| download | build-d96e487b9bbeac8e08a00d64507534dad3e9e5a8.zip build-d96e487b9bbeac8e08a00d64507534dad3e9e5a8.tar.gz build-d96e487b9bbeac8e08a00d64507534dad3e9e5a8.tar.bz2 | |
am 5754ad7e: am 5c327ec3: am 0f7ecd64: am b1c2727a: Merge "Pack relocations for x86"
* commit '5754ad7ead23fb613f9fe4de2970283d18141ea5':
Pack relocations for x86
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 8d73fee..ed78372 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -142,6 +142,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 |