diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-07-25 12:44:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-23 19:30:00 +0000 |
| commit | 970d053c975e9ee38e61fc00506362a76fcc153d (patch) | |
| tree | 95ceaa52ccd24db67a790b145b91c296be8465bd | |
| parent | 77d93bceb06dd3983868327b03a726bf5d8ae079 (diff) | |
| parent | 5679e356d298c58e839f03c45050192e813e79f8 (diff) | |
| download | build-970d053c975e9ee38e61fc00506362a76fcc153d.tar.gz | |
Merge "Fix doc target for multidex support library."
| -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 2355a8f617..b2abc07989 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -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 |