StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix doc target for multidex support library." into lmp-dev

Browse Source
This commit is contained in:
Yohann Roussel
2014-07-29 09:30:14 +00:00
committed by Android (Google) Code Review
parent 82af97fc27 85cacbe0e0
commit 355520e35e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/pathmap.mk
View File

@@ -121,8 +121,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
@@ -130,12 +130,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