From a9d5cf7cd7a6b8ae6f59368d343964049662ce4f Mon Sep 17 00:00:00 2001 From: Yigit Boyar Date: Wed, 29 Apr 2015 19:34:56 -0700 Subject: [PATCH] DO NOT MERGE Remove RecyclerView tests form pathmap Bug: 20675894 Change-Id: Ia482c860b7c02f1c37b94c961cf283754c60cbcc (cherry picked from commit a85c85ae370be73fbc920177c87e739d7353059b) (cherry picked from commit fa358f72280e6ee320ddd1c3302eed651dcc2d0a) --- core/pathmap.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/pathmap.mk b/core/pathmap.mk index 137b5d5201..ce33ee2f3b 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 \ @@ -130,13 +129,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