commit 385f5e7d090d4721e61d0db60e7287dae8117b77
author Ying Wang <wangying@google.com> Fri Jan 30 19:34:45 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 30 19:34:45 2015 +0000
tree 2d53da96b46be50519cbdc71ba74a5856c154887
parent 84146f73014ac0037bfafa84f5075aa98dd6e2ef
parent 7ecc76a0f206c07dfd0db9c81673514a31719d33

am 7ecc76a0: Support dpi specific aapt flags.

* commit '7ecc76a0f206c07dfd0db9c81673514a31719d33':
  Support dpi specific aapt flags.

core/dpi_specific_apk.mk

diff --git a/core/dpi_specific_apk.mk b/core/dpi_specific_apk.mk
index aad4713..0e8cbdf 100644
--- a/core/dpi_specific_apk.mk
+++ b/core/dpi_specific_apk.mk
@@ -8,7 +8,7 @@
 
 # Set up all the target-specific variables.
 $(built_dpi_apk): PRIVATE_MODULE := $(dpi_apk_name)
-$(built_dpi_apk): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) $(PRODUCT_AAPT_FLAGS)
+$(built_dpi_apk): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) $(PRODUCT_AAPT_FLAGS) $($(LOCAL_PACKAGE_NAME)_aapt_flags_$(my_dpi))
 # Clear PRIVATE_PRODUCT_AAPT_CONFIG to include everything by default.
 $(built_dpi_apk): PRIVATE_PRODUCT_AAPT_CONFIG :=
 $(built_dpi_apk): PRIVATE_PRODUCT_AAPT_PREF_CONFIG := $(my_dpi)