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/base_rules.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/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 64ca5b2..260e836 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -98,8 +98,8 @@ ifneq ($(words $(LOCAL_MODULE_CLASS)),1) endif ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) -LOCAL_MODULE_PATH := $(strip $(LOCAL_MODULE_PATH)) -ifeq ($(LOCAL_MODULE_PATH),) +my_module_path := $(strip $(LOCAL_MODULE_PATH)) +ifeq ($(my_module_path),) ifdef LOCAL_IS_HOST_MODULE partition_tag := else @@ -116,9 +116,9 @@ ifeq ($(LOCAL_MODULE_PATH),) install_path_var := $(install_path_var)_PRIVILEGED endif - LOCAL_MODULE_PATH := $($(install_path_var)) - ifeq ($(strip $(LOCAL_MODULE_PATH)),) - $(error $(LOCAL_PATH): unhandled install path "$(install_path_var)") + my_module_path := $($(install_path_var)) + ifeq ($(strip $(my_module_path)),) + $(error $(LOCAL_PATH): unhandled install path "$(install_path_var) for $(LOCAL_MODULE)") endif endif endif # not LOCAL_UNINSTALLABLE_MODULE @@ -172,7 +172,7 @@ LOCAL_BUILT_MODULE := $(built_module_path)/$(LOCAL_BUILT_MODULE_STEM) built_module_path := ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) - LOCAL_INSTALLED_MODULE := $(LOCAL_MODULE_PATH)/$(LOCAL_INSTALLED_MODULE_STEM) + LOCAL_INSTALLED_MODULE := $(my_module_path)/$(LOCAL_INSTALLED_MODULE_STEM) endif # Assemble the list of targets to create PRIVATE_ variables for. |