commit 5534ade20c8a004ae9bea73e95137df8ea206a7d
author Ying Wang <wangying@google.com> Fri Jan 30 21:19:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 30 21:19:47 2015 +0000
tree 0148f29a9446da8285e69811daf5c7828b4a3ef6
parent 22f979f76a8da72411feac54f3967c3a38ee36c9
parent 385f5e7d090d4721e61d0db60e7287dae8117b77

am 385f5e7d: am 7ecc76a0: Support dpi specific aapt flags.

* commit '385f5e7d090d4721e61d0db60e7287dae8117b77':
  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 11c7c84..a05380f 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)