diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-07-25 18:45:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-25 18:45:02 +0000 |
| commit | f0f5f695de16c814ab2931e7599afb58ad2180fc (patch) | |
| tree | c7d7485ce7e8208d2a91595b92f3775ea4ac4374 /core/pathmap.mk | |
| parent | 28665b585038eff1f655237d1028578b0d19acb6 (diff) | |
| parent | 4e0693cf6c3420d1cc8fcd7768a339458612b28d (diff) | |
| download | build-f0f5f695de16c814ab2931e7599afb58ad2180fc.zip build-f0f5f695de16c814ab2931e7599afb58ad2180fc.tar.gz build-f0f5f695de16c814ab2931e7599afb58ad2180fc.tar.bz2 | |
am 4e0693cf: am 970d053c: Merge "Fix doc target for multidex support library."
* commit '4e0693cf6c3420d1cc8fcd7768a339458612b28d':
Fix doc target for multidex support library.
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 |