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

Commit 6d6ba8aa authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Allow globally disabling the relocation packer."

parents 79dd4b29 52831d11

core/dynamic_binary.mk

+4 −1
Original line number Diff line number Diff line
@@ -44,7 +44,10 @@ include $(BUILD_SYSTEM)/binary.mk 
relocation_packer_input := $(linked_module)

relocation_packer_output := $(intermediates)/PACKED/$(my_built_module_stem)



my_pack_module_relocations := false

ifneq ($(DISABLE_RELOCATION_PACKER),true)

    my_pack_module_relocations := $(LOCAL_PACK_MODULE_RELOCATIONS)

endif



ifeq ($(my_pack_module_relocations),)

  my_pack_module_relocations := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_PACK_MODULE_RELOCATIONS)

core/prebuilt_internal.mk

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ ifeq (SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)) 
    # Do not pack relocations by default

    LOCAL_PACK_MODULE_RELOCATIONS := false

  endif



  ifeq ($(DISABLE_RELOCATION_PACKER),true)

    LOCAL_PACK_MODULE_RELOCATIONS := false

  endif

endif



ifneq ($(filter STATIC_LIBRARIES SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)),)