From 1d4804ccd120bfbd82a6c8cbe5b85cfcc44d875a Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Thu, 23 Apr 2015 18:43:05 -0700 Subject: [PATCH] Pack relocations for x86 Bug: http://b/18051137 Change-Id: I3f316343e9bbd2037a9583d5b6fb41a06be153cd --- core/combo/TARGET_linux-x86.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 8d73fee9f6..ed78372cf4 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