commit 10380bc773934e1ba14964731e30b69f251c3afc
author Yigit Boyar <yboyar@google.com> Fri May 22 23:22:18 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 22 23:22:20 2015 +0000
tree 6760c932df8e9aec5a6ef41c8a7b2be25d0eec2f
parent cbe032f87a2fc2b2f954d3be9057d6e4cc845d92
parent a9d5cf7cd7a6b8ae6f59368d343964049662ce4f

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

core/pathmap.mk

diff --git a/core/pathmap.mk b/core/pathmap.mk
index 137b5d5..ce33ee2 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -111,7 +111,6 @@
         v7/cardview \
         v7/mediarouter \
         v7/palette \
-        v7/recyclerview \
         v8/renderscript \
         v13 \
         v17/leanback \
@@ -130,13 +129,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