diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-07-18 10:51:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-17 22:36:58 +0000 |
| commit | d5389ba4163a1a8506ab91fb287c1167a3de521f (patch) | |
| tree | 5087ed95cf4877c968ff6d8c1170c08eeaf5456f /core | |
| parent | 182ac4e3fd5bf9397bf5f8397e2cc599e761e16b (diff) | |
| parent | 4cb1d0956d8d8efd7bdd636ff3e39fe675009cd4 (diff) | |
| download | build-d5389ba4163a1a8506ab91fb287c1167a3de521f.zip build-d5389ba4163a1a8506ab91fb287c1167a3de521f.tar.gz build-d5389ba4163a1a8506ab91fb287c1167a3de521f.tar.bz2 | |
Merge "Move multidex support library"
Diffstat (limited to 'core')
| -rw-r--r-- | core/pathmap.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/core/pathmap.mk b/core/pathmap.mk index 0da90bd..9bb3788 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -110,7 +110,12 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \ v7/appcompat \ v7/mediarouter \ v8/renderscript \ - v13 \ + v13 + +# +# A list of all source roots under frameworks/support. +# +FRAMEWORKS_MULTIDEX_SUBDIRS := \ multidex \ multidex/instrumentation @@ -119,11 +124,13 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \ # the root of the tree. # FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \ - $(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) + $(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_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_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir))) \ + $(foreach dir,$(FRAMEWORKS_MULTIDEX_SUBDIRS),android-support-$(subst /,-,$(dir))) |