Fix doc target for multidex support library.

Change-Id: I0136c6cd8a3af0dc9d12b9424f96e9527cde68e2
This commit is contained in:
Yohann Roussel
2014-07-24 17:24:30 +02:00
parent 1bb9adb880
commit 5679e356d2

View File

@@ -116,8 +116,8 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \
# A list of all source roots under frameworks/multidex. # A list of all source roots under frameworks/multidex.
# #
FRAMEWORKS_MULTIDEX_SUBDIRS := \ FRAMEWORKS_MULTIDEX_SUBDIRS := \
multidex \ multidex/library/src \
multidex/instrumentation multidex/instrumentation/src
# #
# A version of FRAMEWORKS_SUPPORT_SUBDIRS that is expanded to full paths from # A version of FRAMEWORKS_SUPPORT_SUBDIRS that is expanded to full paths from
@@ -125,12 +125,13 @@ FRAMEWORKS_MULTIDEX_SUBDIRS := \
# #
FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \ FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \
$(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \ $(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \
$(addsuffix /src,$(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS))) $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS))
# #
# A list of support library modules. # A list of support library modules.
# #
FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \ FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \
$(foreach dir,$(FRAMEWORKS_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir))) \ $(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