diff options
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | core/base_rules.mk | 34 |
2 files changed, 19 insertions, 17 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index b9f6e1390b..9d3fc23c0f 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -398,6 +398,8 @@ $(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/ $(call add-clean-step, rm -rf $(HOST_OUT_TESTCASES)) $(call add-clean-step, rm -rf $(TARGET_OUT_TESTCASES)) +$(call add-clean-step, rm -rf $(TARGET_OUT_ETC)/init) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/base_rules.mk b/core/base_rules.mk index 1f55eaef32..8cceaad589 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -163,24 +163,24 @@ my_module_path := $(strip $(LOCAL_MODULE_PATH)) endif my_module_path := $(patsubst %/,%,$(my_module_path)) my_module_relative_path := $(strip $(LOCAL_MODULE_RELATIVE_PATH)) +ifdef LOCAL_IS_HOST_MODULE + partition_tag := +else +ifeq (true,$(LOCAL_PROPRIETARY_MODULE)) + partition_tag := _VENDOR +else ifeq (true,$(LOCAL_OEM_MODULE)) + partition_tag := _OEM +else ifeq (true,$(LOCAL_ODM_MODULE)) + partition_tag := _ODM +else ifeq (NATIVE_TESTS,$(LOCAL_MODULE_CLASS)) + partition_tag := _DATA +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,$(my_module_tags)),,_DATA) +endif +endif ifeq ($(my_module_path),) - ifdef LOCAL_IS_HOST_MODULE - partition_tag := - else - ifeq (true,$(LOCAL_PROPRIETARY_MODULE)) - partition_tag := _VENDOR - else ifeq (true,$(LOCAL_OEM_MODULE)) - partition_tag := _OEM - else ifeq (true,$(LOCAL_ODM_MODULE)) - partition_tag := _ODM - else ifeq (NATIVE_TESTS,$(LOCAL_MODULE_CLASS)) - partition_tag := _DATA - 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,$(my_module_tags)),,_DATA) - endif - endif install_path_var := $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT$(partition_tag)_$(LOCAL_MODULE_CLASS) ifeq (true,$(LOCAL_PRIVILEGED_MODULE)) install_path_var := $(install_path_var)_PRIVILEGED |