diff options
| author | Ying Wang <wangying@google.com> | 2014-01-23 15:09:04 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-01-24 13:38:34 -0800 |
| commit | b8e01854893f7390f23e6df82744b2bd3d0572c4 (patch) | |
| tree | 163ac6783685b010132e1ce3b6117f5ef6dbf0b3 /core/dynamic_binary.mk | |
| parent | 5c7fed28f2c06e80182a08e36318d66e494a5a33 (diff) | |
| download | build-b8e01854893f7390f23e6df82744b2bd3d0572c4.zip build-b8e01854893f7390f23e6df82744b2bd3d0572c4.tar.gz build-b8e01854893f7390f23e6df82744b2bd3d0572c4.tar.bz2 | |
Support arch-specific LOCAL_ variables
With those variables, you can set up different values for TARGET_ARCH
and TARGET_2ND_ARCH.
Also fixed a couple of variables.
Bug: 11654773
Change-Id: I4c7684a562cd5877d18f67d4f848b8df07d0103b
Conflicts:
core/base_rules.mk
Diffstat (limited to 'core/dynamic_binary.mk')
| -rw-r--r-- | core/dynamic_binary.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk index 38dd0c9..6d3d2b5 100644 --- a/core/dynamic_binary.mk +++ b/core/dynamic_binary.mk @@ -87,10 +87,12 @@ endif ## Store a copy with symbols for symbolic debugging ########################################################### ifeq ($(LOCAL_UNSTRIPPED_PATH),) -LOCAL_UNSTRIPPED_PATH := $(TARGET_OUT_UNSTRIPPED)/$(patsubst $(PRODUCT_OUT)/%,%,$(LOCAL_MODULE_PATH)) +my_unstripped_path := $(TARGET_OUT_UNSTRIPPED)/$(patsubst $(PRODUCT_OUT)/%,%,$(my_module_path)) +else +my_unstripped_path := $(LOCAL_UNSTRIPPED_PATH) endif symbolic_input := $(compress_output) -symbolic_output := $(LOCAL_UNSTRIPPED_PATH)/$(LOCAL_INSTALLED_MODULE_STEM) +symbolic_output := $(my_unstripped_path)/$(LOCAL_INSTALLED_MODULE_STEM) $(symbolic_output) : $(symbolic_input) | $(ACP) @echo "target Symbolic: $(PRIVATE_MODULE) ($@)" $(copy-file-to-target) @@ -108,9 +110,9 @@ endif ifeq ($(LOCAL_STRIP_MODULE),true) # Strip the binary -$(strip_output): PRIVATE_STRIP := $(TARGET_STRIP) -$(strip_output): PRIVATE_OBJCOPY := $(TARGET_OBJCOPY) -$(strip_output): $(strip_input) | $(TARGET_STRIP) +$(strip_output): PRIVATE_STRIP := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_STRIP) +$(strip_output): PRIVATE_OBJCOPY := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJCOPY) +$(strip_output): $(strip_input) | $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_STRIP) $(transform-to-stripped) else # Don't strip the binary, just copy it. We can't skip this step |