diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-07-18 14:47:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-18 14:47:52 +0000 |
| commit | 6b2f483524834ce3e654791b238b09072a013d70 (patch) | |
| tree | bd5604537757fbafa4a042473298b84685ced1d9 /core/pathmap.mk | |
| parent | d3101a1bbcbf66d302ea03b350645cf41cd79169 (diff) | |
| parent | d825997d8765efd074279ec10ee11eda1f1bb196 (diff) | |
| download | build-6b2f483524834ce3e654791b238b09072a013d70.zip build-6b2f483524834ce3e654791b238b09072a013d70.tar.gz build-6b2f483524834ce3e654791b238b09072a013d70.tar.bz2 | |
am d825997d: am 1029013a: Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex"
* commit 'd825997d8765efd074279ec10ee11eda1f1bb196':
Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
Diffstat (limited to 'core/pathmap.mk')
| -rw-r--r-- | core/pathmap.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/pathmap.mk b/core/pathmap.mk index a4a60fa..30b1ab7 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -118,7 +118,7 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \ v17/leanback # -# A list of all source roots under frameworks/support. +# A list of all source roots under frameworks/multidex. # FRAMEWORKS_MULTIDEX_SUBDIRS := \ multidex \ @@ -130,7 +130,7 @@ FRAMEWORKS_MULTIDEX_SUBDIRS := \ # FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \ $(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \ - $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS)) + $(addsuffix /src,$(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS))) # # A list of support library modules. |