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

Commit 387a9fee authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by Android Git Automerger
Browse files

am 941d61de: am 1ff47c7f: Merge "Revert "Pack relocation tables for all dynamic executables"" 

* commit '941d61de':
  Revert "Pack relocation tables for all dynamic executables"
parents b7b27621 941d61de

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ 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

+2 −0
Original line number Diff line number Diff line
@@ -188,6 +188,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_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-arm64.mk

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



TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm



TARGET_LINKER := /system/bin/linker64

core/combo/TARGET_linux-mips.mk

+2 −0
Original line number Diff line number Diff line
@@ -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_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

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



TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm



TARGET_LINKER := /system/bin/linker64