From 8b07ed87fac07337f82f96613aa4e3f6170b279b Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Tue, 28 Dec 2010 13:14:29 -0800
Subject: [PATCH] LOCAL_AAPT_INCLUDE_ALL_RESOURCES

Set this flag to include all the resources in the given dirs.
Bug: 3313179

Change-Id: I68c02b24174bebe41a5948810cc2f49cc916e51c
---
 core/clear_vars.mk | 1 +
 core/package.mk    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 5c4dbea799..ca70c55f01 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -44,6 +44,7 @@ LOCAL_C_INCLUDES:=
 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 f8be8a700e..4033f8dfd8 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -331,6 +331,9 @@ $(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries)
 $(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)