commit 664035f771d8ff48b0e2d421755595c86e856c96
author Maurice Chu <mochu@google.com> Wed Oct 16 14:30:42 2013 -0700
committer Yohann Roussel <yroussel@google.com> Fri Nov 08 00:09:14 2013 +0100
tree 25136f9c00b7e0482499b04a8cf12ff16e5155ac
parent 198bd8fd388dedd1a494cabf1889724b70354d23

Move multidex support library

Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

GMS Core will be using the multidex library and has gotten special
approval to use the unreleased multidex library (i.e., guinea pig).

Bug: 10674263
Change-Id: I31f582dd7adf4db6eb19c52357875594fc9f7829

core/pathmap.mk

diff --git a/core/pathmap.mk b/core/pathmap.mk
index 7b81d71..47c6906 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -110,7 +110,12 @@
         v7/appcompat \
         v7/mediarouter \
         v8/renderscript \
-        v13 \
+        v13
+
+#
+# A list of all source roots under frameworks/support.
+#
+FRAMEWORKS_MULTIDEX_SUBDIRS := \
         multidex \
         multidex/instrumentation
 
@@ -119,11 +124,13 @@
 # the root of the tree.
 #
 FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \
-	$(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS))
+	$(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \
+        $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS))
 
 #
 # A list of support library modules.
 #
 FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \
-    $(foreach dir,$(FRAMEWORKS_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir)))
+    $(foreach dir,$(FRAMEWORKS_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir))) \
+    $(foreach dir,$(FRAMEWORKS_MULTIDEX_SUBDIRS),android-support-$(subst /,-,$(dir)))