Allow globally disabling the relocation packer.
The relocation packer is part of prebuilts/misc, and pulling that repository into the manifest requires pulling in a lot of other things not needed by the simpler builds (like the clang toolchain manifest). Bug: http://b/17441393 Change-Id: If4a94804fc1a3f81215b840247f8e332d0b510c1
This commit is contained in:
@@ -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)
|
||||
|
@@ -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)),)
|
||||
|
Reference in New Issue
Block a user