commit 8c7121de860739c98ff933c56d4e5596c65965e2
author Yigit Boyar <yboyar@google.com> Thu May 07 01:40:09 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 07 01:40:10 2015 +0000
tree 954d4643c9f0efa027d78be46782d81c88bdf05d
parent 64434af7725937d7dcc4a0e1a6a013758bf18dba
parent fa358f72280e6ee320ddd1c3302eed651dcc2d0a

Merge "DO NOT MERGE Remove RecyclerView tests form pathmap" into mnc-dev

core/pathmap.mk

diff --git a/core/pathmap.mk b/core/pathmap.mk
index 01803bd..badf8bc 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -112,7 +112,6 @@
         v7/cardview \
         v7/mediarouter \
         v7/palette \
-        v7/recyclerview \
         v8/renderscript \
         v13 \
         v17/leanback \
@@ -131,13 +130,15 @@
 #
 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