LOCAL_AAPT_INCLUDE_ALL_RESOURCES
Set this flag to include all the resources in the given dirs.
Bug: 3313179
Change-Id: I68c02b24174bebe41a5948810cc2f49cc916e51c
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 5c4dbea..ca70c55 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -44,6 +44,7 @@
LOCAL_LDFLAGS:=
LOCAL_LDLIBS:=
LOCAL_AAPT_FLAGS:=
+LOCAL_AAPT_INCLUDE_ALL_RESOURCES:=
LOCAL_SYSTEM_SHARED_LIBRARIES:=none
LOCAL_PREBUILT_LIBS:=
LOCAL_PREBUILT_EXECUTABLES:=
diff --git a/core/package.mk b/core/package.mk
index f8be8a7..4033f8d 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -331,6 +331,9 @@
$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES_ABI := $(jni_shared_libraries_abi)
ifneq ($(TARGET_BUILD_APPS),)
# Include all resources for unbundled apps.
+ LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
+endif
+ifeq ($(LOCAL_AAPT_INCLUDE_ALL_RESOURCES),true)
$(LOCAL_BUILT_MODULE): PRODUCT_AAPT_CONFIG :=
endif
$(LOCAL_BUILT_MODULE): $(all_res_assets) $(jni_shared_libraries) $(full_android_manifest)