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.