Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c2d1a64 authored by Dmitriy Ivanov's avatar Dmitriy Ivanov
Browse files

Pack relocation tables for dynamic executables 

  Add replocation-packer step for dynmic executables.

  Enable it by default for arm and arm64 platforms.

Bug: http://b/18051137
Change-Id: I0c88fd31595bcea62a087f219acb9ecf9c80f2e5
parent 1ff47c7f

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ LOCAL_COPY_HEADERS:= 
LOCAL_FORCE_STATIC_EXECUTABLE:=

LOCAL_ADDITIONAL_DEPENDENCIES:=

LOCAL_STRIP_MODULE:=

LOCAL_PACK_MODULE_RELOCATIONS:=

LOCAL_JNI_SHARED_LIBRARIES:=

LOCAL_JNI_SHARED_LIBRARIES_ABI:=

LOCAL_PREBUILT_JNI_LIBS:=

core/combo/TARGET_linux-arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ $(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_STRIP_MODULE:=true

$(combo_2nd_arch_prefix)TARGET_PACK_MODULE_RELOCATIONS := true



$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm

core/combo/TARGET_linux-arm64.mk

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ 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_STRIP_MODULE:=true

TARGET_PACK_MODULE_RELOCATIONS := true



TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm

core/combo/TARGET_linux-mips.mk

+0 −2
Original line number Diff line number Diff line
@@ -162,8 +162,6 @@ $(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_STRIP_MODULE:=true



$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm



$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker

core/combo/TARGET_linux-mips64.mk

+0 −2
Original line number Diff line number Diff line
@@ -169,8 +169,6 @@ 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_STRIP_MODULE:=true



TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm



TARGET_LINKER := /system/bin/linker64