openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Allow globally disabling the relocation packer." 

am: 6d6ba8aaf1

* commit '6d6ba8aaf19b3f5cb209c0b60c7bfd1900411945':
  Allow globally disabling the relocation packer.
This commit is contained in:
Dan Albert 2015-11-13 01:18:24 +00:00 committed by android-build-merger
parent 741c16686e 6d6ba8aaf1
commit 18ace0f2fe
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/dynamic_binary.mk
View File

@ -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 := $(LOCAL_PACK_MODULE_RELOCATIONS)
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)

4
core/prebuilt_internal.mk
View File

@ -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)),)