diff options
| author | Ying Wang <wangying@google.com> | 2011-10-05 09:07:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-05 09:07:53 -0700 |
| commit | 0611aeedeb58bf4df1f1143f602aa64c8dbddc35 (patch) | |
| tree | 0f2743c83194cd49a0a068832aa03e755ff6ba0b /core | |
| parent | 81703a19001ec219c35cb0ecf9bafb6e0dbc1e1d (diff) | |
| parent | 43e18e0d7ba8c83335a4e782f0f3be737322f209 (diff) | |
| download | build-0611aeedeb58bf4df1f1143f602aa64c8dbddc35.zip build-0611aeedeb58bf4df1f1143f602aa64c8dbddc35.tar.gz build-0611aeedeb58bf4df1f1143f602aa64c8dbddc35.tar.bz2 | |
Merge "Install path support for vendor modules." into ics-factoryrom
Diffstat (limited to 'core')
| -rw-r--r-- | core/base_rules.mk | 14 | ||||
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/envsetup.mk | 8 |
3 files changed, 18 insertions, 5 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 8039d65..e18b6ec 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -122,12 +122,16 @@ ifneq (,$(filter $(LOCAL_MODULE),$(CUSTOM_MODULES))) LOCAL_MODULE_TAGS := $(sort $(LOCAL_MODULE_TAGS) user) endif -# The definition of should-install-to-system will be different depending -# on which goal (e.g., sdk or just droid) is being built. ifdef LOCAL_IS_HOST_MODULE - use_data := + partition_tag := else - use_data := $(if $(call should-install-to-system,$(LOCAL_MODULE_TAGS)),,_DATA) +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_CLASS := $(strip $(LOCAL_MODULE_CLASS)) @@ -145,7 +149,7 @@ endif LOCAL_MODULE_PATH := $(strip $(LOCAL_MODULE_PATH)) ifeq ($(LOCAL_MODULE_PATH),) - LOCAL_MODULE_PATH := $($(my_prefix)OUT$(use_data)_$(LOCAL_MODULE_CLASS)) + LOCAL_MODULE_PATH := $($(my_prefix)OUT$(partition_tag)_$(LOCAL_MODULE_CLASS)) ifeq ($(strip $(LOCAL_MODULE_PATH)),) $(error $(LOCAL_PATH): unhandled LOCAL_MODULE_CLASS "$(LOCAL_MODULE_CLASS)") endif diff --git a/core/clear_vars.mk b/core/clear_vars.mk index c5e4cc7..8c5a40e 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -112,6 +112,7 @@ LOCAL_DEX_PREOPT:= LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,full LOCAL_PROTOC_FLAGS:= LOCAL_NO_CRT:= +LOCAL_PROPRIETARY_MODULE:= # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # iterate over thousands of entries every time. diff --git a/core/envsetup.mk b/core/envsetup.mk index 016560a..c3ae3b0 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -206,6 +206,14 @@ TARGET_OUT_DATA_ETC := $(TARGET_OUT_ETC) TARGET_OUT_DATA_STATIC_LIBRARIES:= $(TARGET_OUT_STATIC_LIBRARIES) TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest +TARGET_OUT_VENDOR := $(PRODUCT_OUT)/system/vendor +TARGET_OUT_VENDOR_EXECUTABLES:= $(TARGET_OUT_VENDOR)/bin +TARGET_OUT_VENDOR_OPTIONAL_EXECUTABLES:= $(TARGET_OUT_VENDOR)/xbin +TARGET_OUT_VENDOR_SHARED_LIBRARIES:= $(TARGET_OUT_VENDOR)/lib +TARGET_OUT_VENDOR_JAVA_LIBRARIES:= $(TARGET_OUT_VENDOR)/framework +TARGET_OUT_VENDOR_APPS:= $(TARGET_OUT_VENDOR)/app +TARGET_OUT_VENDOR_ETC := $(TARGET_OUT_VENDOR)/etc + TARGET_OUT_UNSTRIPPED := $(PRODUCT_OUT)/symbols TARGET_OUT_EXECUTABLES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/bin TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/lib |