commit 100aba5374376f679602387db59fccd609b8abe3
author Yohann Roussel <yroussel@google.com> Thu Jul 17 16:52:58 2014 +0200
committer Yohann Roussel <yroussel@google.com> Thu Jul 17 17:20:03 2014 +0200
tree 8be563f037e851916e5bd451074f8090ae4426c2
parent 4cb1d0956d8d8efd7bdd636ff3e39fe675009cd4

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.

Change-Id: Icd6903a43c90efc08eba92976dddb104c45a5e43

core/pathmap.mk

diff --git a/core/pathmap.mk b/core/pathmap.mk
index 9bb3788..2355a8f 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -113,7 +113,7 @@
         v13
 
 #
-# A list of all source roots under frameworks/support.
+# A list of all source roots under frameworks/multidex.
 #
 FRAMEWORKS_MULTIDEX_SUBDIRS := \
         multidex \
@@ -125,7 +125,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.