commit 266cf4f2595323170fe02db05835884b4522a0f9
author Ying Wang <wangying@google.com> Mon Mar 24 21:21:26 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 24 21:21:26 2014 +0000
tree a835ea35366d25be808bf223881309d3b6fb1a93
parent bb79f9d2a52c7f1e20bd74e5d80b2df4119cec82
parent f39752e99b4e5083f1e91c46722f87def8143b49

am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS

* commit 'f39752e99b4e5083f1e91c46722f87def8143b49':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 9a4a274..76b86ff 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1649,7 +1649,7 @@
     $(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)) \