From f39752e99b4e5083f1e91c46722f87def8143b49 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 20 Mar 2014 17:28:57 -0700 Subject: [PATCH] Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS Bug: 11335547 Change-Id: Ic08b7557a288508e8e8d14a725923960c47f5ca0 --- core/definitions.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/definitions.mk b/core/definitions.mk index e1eb9f12b..b35a6c391 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)) \ -- 2.11.0