diff options
| author | Joe Onorato <joeo@google.com> | 2010-10-05 17:33:58 -0400 |
|---|---|---|
| committer | Joe Onorato <joeo@google.com> | 2010-10-06 10:44:33 -0400 |
| commit | 700b88e1451f216d137d8a356496bf51712512c6 (patch) | |
| tree | 416acbcdd38586fcef494b47c60f1f98de6cbaef | |
| parent | 476d70aece4395dc29288c3d647c64732d3a6d3d (diff) | |
| download | build-700b88e1451f216d137d8a356496bf51712512c6.zip build-700b88e1451f216d137d8a356496bf51712512c6.tar.gz build-700b88e1451f216d137d8a356496bf51712512c6.tar.bz2 | |
Pass device characteristic information through to aapt.
A build configuration can define PRODUCT_CHARACTERISTICS, which is
a comma-separated list of device characteristics, for example
"nosdcard,grayscale". This will be passed through to aapt with
the --product flag.
Change-Id: I902c034b2f2824dbd2d33449308ee08beeb09551
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | core/definitions.mk | 1 | ||||
| -rw-r--r-- | core/product.mk | 1 | ||||
| -rw-r--r-- | core/product_config.mk | 6 |
4 files changed, 9 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index fc35169..2663780 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -50,6 +50,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/android-info.txt) +$(call add-clean-step, find $(PRODUCT_OUT) -name "*.apk" | xargs rm) # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/definitions.mk b/core/definitions.mk index 6f7d2a3..6232668 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1367,6 +1367,7 @@ $(hide) $(AAPT) package -u $(PRIVATE_AAPT_FLAGS) \ $(addprefix -I , $(PRIVATE_AAPT_INCLUDES)) \ $(addprefix --min-sdk-version , $(DEFAULT_APP_TARGET_SDK)) \ $(addprefix --target-sdk-version , $(DEFAULT_APP_TARGET_SDK)) \ + $(addprefix --product , $(TARGET_AAPT_CHARACTERISTICS)) \ $(if $(filter --version-code,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --version-code , $(PLATFORM_SDK_VERSION))) \ $(if $(filter --version-name,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --version-name , $(PLATFORM_VERSION))) \ $(addprefix --rename-manifest-package , $(PRIVATE_MANIFEST_PACKAGE_NAME)) \ diff --git a/core/product.mk b/core/product.mk index 7594f6f..4a0ee01 100644 --- a/core/product.mk +++ b/core/product.mk @@ -68,6 +68,7 @@ _product_var_list := \ PRODUCT_MANUFACTURER \ PRODUCT_BRAND \ PRODUCT_PROPERTY_OVERRIDES \ + PRODUCT_CHARACTERISTICS \ PRODUCT_COPY_FILES \ PRODUCT_OTA_PUBLIC_KEYS \ PRODUCT_PACKAGE_OVERLAYS \ diff --git a/core/product_config.mk b/core/product_config.mk index 4824245..70ac894 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -253,6 +253,12 @@ ifndef PRODUCT_MANUFACTURER PRODUCT_MANUFACTURER := unknown endif +ifeq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_CHARACTERISTICS),) + TARGET_AAPT_CHARACTERISTICS := default +else + TARGET_AAPT_CHARACTERISTICS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_CHARACTERISTICS)) +endif + PRODUCT_DEFAULT_WIFI_CHANNELS := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEFAULT_WIFI_CHANNELS)) |