From 85cacbe0e0bd482c5954d93e8234a3bc6c290f65 Mon Sep 17 00:00:00 2001 From: Yohann Roussel Date: Thu, 24 Jul 2014 17:24:30 +0200 Subject: [PATCH] Fix doc target for multidex support library. (cherry picked from commit 5679e356d298c58e839f03c45050192e813e79f8) Change-Id: I2e97f59796046d94c9b03dbc89ec1d2153b54ce1 --- core/pathmap.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/pathmap.mk b/core/pathmap.mk index 30b1ab740..0e10ac1f9 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -121,8 +121,8 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \ # 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 @@ -130,12 +130,13 @@ FRAMEWORKS_MULTIDEX_SUBDIRS := \ # 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