diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-07-24 17:24:30 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2014-07-25 17:14:35 +0200 |
| commit | 85cacbe0e0bd482c5954d93e8234a3bc6c290f65 (patch) | |
| tree | 25917034082736f85e64db4e2d845d529ce45b18 /core/pathmap.mk | |
| parent | 6aef04736294976b3bedaae5cb581a01f6387cc7 (diff) | |
| download | build-85cacbe0e0bd482c5954d93e8234a3bc6c290f65.zip build-85cacbe0e0bd482c5954d93e8234a3bc6c290f65.tar.gz build-85cacbe0e0bd482c5954d93e8234a3bc6c290f65.tar.bz2 | |
Fix doc target for multidex support library.
(cherry picked from commit 5679e356d298c58e839f03c45050192e813e79f8)
Change-Id: I2e97f59796046d94c9b03dbc89ec1d2153b54ce1
Diffstat (limited to 'core/pathmap.mk')
| -rw-r--r-- | core/pathmap.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/pathmap.mk b/core/pathmap.mk index 30b1ab7..0e10ac1 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 |