commit 5679e356d298c58e839f03c45050192e813e79f8
author Yohann Roussel <yroussel@google.com> Thu Jul 24 17:24:30 2014 +0200
committer Yohann Roussel <yroussel@google.com> Thu Jul 24 17:24:30 2014 +0200
tree 8b52a7a8cec5c1d6e8bc2a8cfba0ba93beeb44e9
parent 1bb9adb88004ebdbacf44a95bd4e08065960c5ab

Fix doc target for multidex support library.

Change-Id: I0136c6cd8a3af0dc9d12b9424f96e9527cde68e2

core/pathmap.mk

diff --git a/core/pathmap.mk b/core/pathmap.mk
index 2355a8f..b2abc07 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -116,8 +116,8 @@
 # A list of all source roots under frameworks/multidex.
 #
 FRAMEWORKS_MULTIDEX_SUBDIRS := \
-        multidex \
-        multidex/instrumentation
+        multidex/library/src \
+        multidex/instrumentation/src
 
 #
 # A version of FRAMEWORKS_SUPPORT_SUBDIRS that is expanded to full paths from
@@ -125,12 +125,13 @@
 #
 FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \
 	$(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \
-        $(addsuffix /src,$(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_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_MULTIDEX_SUBDIRS),android-support-$(subst /,-,$(dir)))
+    android-support-multidex \
+    android-support-multidex-instrumentation