commit 934008f9d599fa95edf3ccdd5d5378f9ad4581f0
author Ying Wang <wangying@google.com> Wed Jul 30 13:40:14 2014 -0700
committer Ying Wang <wangying@google.com> Wed Jul 30 13:40:14 2014 -0700
tree fe5bbc2fdc71a961b29d406f42b0497366ab3b7e
parent a961a09e59dcf130435cf5ff052c4f2d7e3986ea

Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set

Bug: 16319961
Change-Id: I8ea308c94ff58eaccd8854ab98e11238b993f867

core/package_internal.mk

diff --git a/core/package_internal.mk b/core/package_internal.mk
index 3f8bdfe..0d6f9ea 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -370,8 +370,12 @@
     $(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_PREF_CONFIG :=
 else
     $(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_CONFIG := $(PRODUCT_AAPT_CONFIG)
+ifdef LOCAL_PACKAGE_SPLITS
+    $(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_PREF_CONFIG :=
+else
     $(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_PREF_CONFIG := $(PRODUCT_AAPT_PREF_CONFIG)
 endif
+endif
 $(LOCAL_BUILT_MODULE): $(all_res_assets) $(jni_shared_libraries) $(full_android_manifest)
 	@echo "target Package: $(PRIVATE_MODULE) ($@)"
 	$(create-empty-package)