From 5eebe0f1b44fbd79601d5d9099edeba5934b79ff Mon Sep 17 00:00:00 2001
From: Adam Lesinski <adamlesinski@google.com>
Date: Tue, 25 Mar 2014 15:45:34 -0700
Subject: [PATCH] Temporarily use a separate var for including shared resources

Change-Id: I56636a1d7dfdaa070706f1991f80e03fe2f71069
---
 core/base_rules.mk       | 6 +++---
 core/clear_vars.mk       | 1 +
 core/package_internal.mk | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 32e6b734c..0b6e46bcd 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -427,10 +427,10 @@ full_java_lib_deps += $(full_static_java_libs) $(LOCAL_CLASSPATH)
 
 # This is set by packages that are linking to other packages that export
 # shared libraries, allowing them to make use of the code in the linked apk.
-LOCAL_APK_LIBRARIES := $(strip $(LOCAL_APK_LIBRARIES))
-ifdef LOCAL_APK_LIBRARIES
+apk_libraries := $(sort $(LOCAL_APK_LIBRARIES) $(LOCAL_RES_LIBRARIES))
+ifneq ($(apk_libraries),)
   link_apk_libraries := \
-      $(foreach lib,$(LOCAL_APK_LIBRARIES), \
+      $(foreach lib,$(apk_libraries), \
         $(call intermediates-dir-for, \
               APPS,$(lib),,COMMON)/classes.jar)
 
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index e9b1c538d..d2a0bfdc3 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -90,6 +90,7 @@ LOCAL_JNI_SHARED_LIBRARIES_ABI:=
 LOCAL_JAR_MANIFEST:=
 LOCAL_INSTRUMENTATION_FOR:=
 LOCAL_APK_LIBRARIES:=
+LOCAL_RES_LIBRARIES:=
 LOCAL_MANIFEST_INSTRUMENTATION_FOR:=
 LOCAL_AIDL_INCLUDES:=
 LOCAL_JARJAR_RULES:=
diff --git a/core/package_internal.mk b/core/package_internal.mk
index 4819a64fe..6e7e75c6b 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -289,12 +289,12 @@ framework_res_package_export_deps := \
 endif # LOCAL_SDK_RES_VERSION
 all_library_res_package_exports := \
     $(framework_res_package_export) \
-    $(foreach lib,$(LOCAL_APK_LIBRARIES),\
+    $(foreach lib,$(LOCAL_RES_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),\
+    $(foreach lib,$(LOCAL_RES_LIBRARIES),\
         $(call intermediates-dir-for,APPS,$(lib),,COMMON)/src/R.stamp)
 
 $(resource_export_package) $(R_file_stamp): $(all_library_res_package_export_deps)
-- 
2.11.0