commit c324a624256da3e53cea5a6c3e2b57937fc6ac24
author Yohann Roussel <yroussel@google.com> Thu Jul 17 16:52:58 2014 +0200
committer Yohann Roussel <yroussel@google.com> Wed Jul 23 16:07:20 2014 +0200
tree de7b0a737a13c62e6a11362416176876f3cc5632
parent 84c26b694978eb6b9ee9400d15283707ea9b3eb9

Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex

This keeps only the real sources in doc target and fixes some error
messages caused by trying to generate docs of the tests.

(cherry picked from commit 100aba5374376f679602387db59fccd609b8abe3)

Change-Id: I39f3ede95ae68777ca5e3db4ab5c6ebeefc86ac6

core/pathmap.mk

diff --git a/core/pathmap.mk b/core/pathmap.mk
index a4a60fa..30b1ab7 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -118,7 +118,7 @@
         v17/leanback
 
 #
-# A list of all source roots under frameworks/support.
+# A list of all source roots under frameworks/multidex.
 #
 FRAMEWORKS_MULTIDEX_SUBDIRS := \
         multidex \
@@ -130,7 +130,7 @@
 #
 FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \
 	$(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \
-        $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS))
+        $(addsuffix /src,$(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS)))
 
 #
 # A list of support library modules.