commit de057c3063b3e67052b82919a4b39dc841ac7ee8
author Adam Lesinski <adamlesinski@google.com> Thu Mar 13 18:48:27 2014 -0700
committer Adam Lesinski <adamlesinski@google.com> Tue Mar 25 13:52:17 2014 -0700
tree 5379e7298bb7bf2c246aa4d02a0109d2b024bbfc
parent a5fdf90bb790074a55ceb28606d6ec943a271f26

Add LOCAL_APK_LIBRARIES to the AAPT -I flag

Change-Id: I5c5c90de3c8ce6c224b6e3fbf42d5e72cfd7a4d1

core/package_internal.mk

diff --git a/core/package_internal.mk b/core/package_internal.mk
index 9f8c35d..ac0268f 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -286,9 +286,19 @@
 framework_res_package_export_deps := \
     $(dir $(framework_res_package_export))src/R.stamp
 endif # LOCAL_SDK_RES_VERSION
-$(R_file_stamp): $(framework_res_package_export_deps)
+all_library_res_package_exports := \
+    $(framework_res_package_export) \
+    $(foreach lib,$(LOCAL_APK_LIBRARIES),\
+        $(call intermediates-dir-for,APPS,$(lib),,COMMON)/package-export.apk)
+
+all_library_res_package_export_deps := \
+    $(framework_res_package_export_deps) \
+    $(foreach lib,$(LOCAL_APK_LIBRARIES),\
+        $(call intermediates-dir-for,APPS,$(lib),,COMMON)/src/R.stamp)
+
+$(R_file_stamp): $(all_library_res_package_export_deps)
 $(LOCAL_INTERMEDIATE_TARGETS): \
-    PRIVATE_AAPT_INCLUDES := $(framework_res_package_export)
+    PRIVATE_AAPT_INCLUDES := $(all_library_res_package_exports)
 endif # LOCAL_NO_STANDARD_LIBRARIES
 
 ifneq ($(full_classes_jar),)