Merge "Remove RecyclerView tests form pathmap" into lmp-mr1-ub-dev

This commit is contained in:
Kris Giesing 2015-05-22 18:58:17 +00:00 committed by Android (Google) Code Review
commit f93d8dd6c2

View file

@ -111,7 +111,6 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \
v7/cardview \ v7/cardview \
v7/mediarouter \ v7/mediarouter \
v7/palette \ v7/palette \
v7/recyclerview \
v8/renderscript \ v8/renderscript \
v13 \ v13 \
v17/leanback \ v17/leanback \
@ -131,13 +130,15 @@ FRAMEWORKS_MULTIDEX_SUBDIRS := \
# #
FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \ FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \
$(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \ $(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. # A list of support library modules.
# #
FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \ FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \
$(foreach dir,$(FRAMEWORKS_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir))) \ $(foreach dir,$(FRAMEWORKS_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir))) \
android-support-v7-recyclerview \
android-support-multidex \ android-support-multidex \
android-support-multidex-instrumentation android-support-multidex-instrumentation