diff options
| author | Ying Wang <wangying@google.com> | 2014-03-20 17:28:57 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-03-20 17:28:57 -0700 |
| commit | f39752e99b4e5083f1e91c46722f87def8143b49 (patch) | |
| tree | 4aa6b6063f2ce0a1a6bdbd28914e24be6699bce9 | |
| parent | 7503e736ebb0161a23ff0ee39a307cd436ea8afc (diff) | |
| download | build-kitkat-dev.tar.gz | |
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGSkitkat-dev
Bug: 11335547
Change-Id: Ic08b7557a288508e8e8d14a725923960c47f5ca0
| -rw-r--r-- | core/definitions.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index e1eb9f12be..b35a6c391c 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1649,7 +1649,7 @@ $(hide) $(AAPT) package -u $(PRIVATE_AAPT_FLAGS) \ $(addprefix -I , $(PRIVATE_AAPT_INCLUDES)) \ $(addprefix --min-sdk-version , $(PRIVATE_DEFAULT_APP_TARGET_SDK)) \ $(addprefix --target-sdk-version , $(PRIVATE_DEFAULT_APP_TARGET_SDK)) \ - $(addprefix --product , $(TARGET_AAPT_CHARACTERISTICS)) \ + $(if $(filter --product,$(PRIVATE_AAPT_FLAGS)),,$(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)-$(BUILD_NUMBER))) \ $(addprefix --rename-manifest-package , $(PRIVATE_MANIFEST_PACKAGE_NAME)) \ |