diff options
| author | Kris Giesing <kgiesing@google.com> | 2015-05-22 18:58:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-22 18:58:18 +0000 |
| commit | f93d8dd6c22705a6880b0f8efb409b378dc692aa (patch) | |
| tree | e9f8f26259f471f7f107ba7481613fb628f7a5aa /core | |
| parent | 4620dbd5903c2b84181e0fec16615d995b8e8556 (diff) | |
| parent | a417909fde07d3b8202e1b5cc4f8b3c6acebc11c (diff) | |
| download | build-f93d8dd6c22705a6880b0f8efb409b378dc692aa.zip build-f93d8dd6c22705a6880b0f8efb409b378dc692aa.tar.gz build-f93d8dd6c22705a6880b0f8efb409b378dc692aa.tar.bz2 | |
Merge "Remove RecyclerView tests form pathmap" into lmp-mr1-ub-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/pathmap.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/pathmap.mk b/core/pathmap.mk index dfde4ce..2914576 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -111,7 +111,6 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \ v7/cardview \ v7/mediarouter \ v7/palette \ - v7/recyclerview \ v8/renderscript \ v13 \ v17/leanback \ @@ -131,13 +130,15 @@ FRAMEWORKS_MULTIDEX_SUBDIRS := \ # FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \ $(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \ - $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS)) + $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS)) \ + frameworks/support/v7/recyclerview/src # # A list of support library modules. # FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \ $(foreach dir,$(FRAMEWORKS_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir))) \ + android-support-v7-recyclerview \ android-support-multidex \ android-support-multidex-instrumentation |