commit 264a5ed3654b71ddc3c6dc0a52371624b2fa5204
author Ying Wang <wangying@google.com> Tue Mar 25 10:10:24 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 25 10:10:24 2014 +0000
tree cfaaa757e4609802f9cdd3a1d46e261e77e6322c
parent cde91b3e6a42e66cb45e75eb69111f37840dffec
parent 711951abf0c753eba551ba88817321e4cd7b37d9

am 711951ab: am 78a819d6: am 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS

* commit '711951abf0c753eba551ba88817321e4cd7b37d9':
  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 2258ea0..fdfa1ca 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1688,7 +1688,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)) \