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

am 970d053c: Merge "Fix doc target for multidex support library."

Browse Source 
* commit '970d053c975e9ee38e61fc00506362a76fcc153d':
  Fix doc target for multidex support library.
This commit is contained in:
Yohann Roussel
2014-07-25 12:53:32 +00:00
committed by Android Git Automerger
parent d161be2d06 970d053c97
commit 4e0693cf6c
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

@@ -116,8 +116,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
@@ -125,12 +125,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