Cherry-pick unbundled build changes from master
Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
diff --git a/core/package.mk b/core/package.mk
index 24807f9..d5de77b 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -304,6 +304,10 @@
# Define the rule to build the actual package.
$(LOCAL_BUILT_MODULE): $(AAPT) | $(ZIPALIGN)
$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries)
+ifeq ($(strip $(is_unbundled_app_build)),true)
+ # Include all resources for unbundled apps.
+ $(LOCAL_BUILT_MODULE): PRODUCT_AAPT_CONFIG :=
+endif
$(LOCAL_BUILT_MODULE): $(all_res_assets) $(jni_shared_libraries) $(full_android_manifest)
@echo "target Package: $(PRIVATE_MODULE) ($@)"
$(create-empty-package)