diff options
| author | Ying Wang <wangying@google.com> | 2013-05-08 15:49:08 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-05-08 15:49:08 -0700 |
| commit | 5338fbfaca6b21ab3178469241641e23eac79d9d (patch) | |
| tree | 1bc52d4210e41e275f66ef621a3c6c5021ec93dc /core/base_rules.mk | |
| parent | f14d85d6fcb740930f15325611609406d658684c (diff) | |
| download | build-5338fbfaca6b21ab3178469241641e23eac79d9d.zip build-5338fbfaca6b21ab3178469241641e23eac79d9d.tar.gz build-5338fbfaca6b21ab3178469241641e23eac79d9d.tar.bz2 | |
Install to TARGET_OUT_APPS_PRIVILEGED if LOCAL_PRIVILEGED_MODULE is true
Change-Id: I268b8652f18034aa3fdd3126ebf6196f78c4bbb2
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index f0a6398..f92cf6a 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -98,23 +98,27 @@ ifneq ($(words $(LOCAL_MODULE_CLASS)),1) endif ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) -ifdef LOCAL_IS_HOST_MODULE - partition_tag := -else -ifeq (true,$(LOCAL_PROPRIETARY_MODULE)) - partition_tag := _VENDOR -else - # The definition of should-install-to-system will be different depending - # on which goal (e.g., sdk or just droid) is being built. - partition_tag := $(if $(call should-install-to-system,$(LOCAL_MODULE_TAGS)),,_DATA) -endif -endif - LOCAL_MODULE_PATH := $(strip $(LOCAL_MODULE_PATH)) ifeq ($(LOCAL_MODULE_PATH),) - LOCAL_MODULE_PATH := $($(my_prefix)OUT$(partition_tag)_$(LOCAL_MODULE_CLASS)) + ifdef LOCAL_IS_HOST_MODULE + partition_tag := + else + ifeq (true,$(LOCAL_PROPRIETARY_MODULE)) + partition_tag := _VENDOR + else + # The definition of should-install-to-system will be different depending + # on which goal (e.g., sdk or just droid) is being built. + partition_tag := $(if $(call should-install-to-system,$(LOCAL_MODULE_TAGS)),,_DATA) + endif + endif + install_path_var := $(my_prefix)OUT$(partition_tag)_$(LOCAL_MODULE_CLASS) + ifeq (true,$(LOCAL_PRIVILEGED_MODULE)) + install_path_var := $(install_path_var)_PRIVILEGED + endif + + LOCAL_MODULE_PATH := $($(install_path_var)) ifeq ($(strip $(LOCAL_MODULE_PATH)),) - $(error $(LOCAL_PATH): unhandled LOCAL_MODULE_CLASS "$(LOCAL_MODULE_CLASS)") + $(error $(LOCAL_PATH): unhandled install path "$(install_path_var)") endif endif endif # not LOCAL_UNINSTALLABLE_MODULE |