summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-04-16 17:57:34 -0700
committerDeepanshu Gupta <deepanshu@google.com>2015-04-17 18:25:24 +0000
commitcc8bf5bfaaf388e6a572be65ff9038ff2ee1a47d (patch)
tree871804dd26b7d54b7d4b914c8604116442cae74d
parenta67060571ee411d35dce266322ae71c47f1ecf02 (diff)
downloadandroid_development-cc8bf5bfaaf388e6a572be65ff9038ff2ee1a47d.tar.gz
android_development-cc8bf5bfaaf388e6a572be65ff9038ff2ee1a47d.tar.bz2
android_development-cc8bf5bfaaf388e6a572be65ff9038ff2ee1a47d.zip
Add resources to recyclerview dependency.
Change-Id: Ifa9ea3759702a59c09ee4d1e7523d4e954773882
-rw-r--r--build/sdk.atree1
-rw-r--r--samples/SupportLeanbackDemos/Android.mk6
2 files changed, 5 insertions, 2 deletions
diff --git a/build/sdk.atree b/build/sdk.atree
index bfdd8fd52..41094a870 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -481,6 +481,7 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-cardview_intermediates
# TODO: add .project, .classpath, etc.
frameworks/support/v7/recyclerview/README.txt extras/android/support/v7/recyclerview/README.txt
frameworks/support/v7/recyclerview/AndroidManifest.xml extras/android/support/v7/recyclerview/AndroidManifest.xml
+frameworks/support/v7/recyclerview/res extras/android/support/v7/recyclerview/res
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-recyclerview_intermediates/android-support-v7-recyclerview.jar extras/android/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
frameworks/support/v17/leanback/README.txt extras/android/support/v17/leanback/README.txt
diff --git a/samples/SupportLeanbackDemos/Android.mk b/samples/SupportLeanbackDemos/Android.mk
index 41424a709..55bbe4482 100644
--- a/samples/SupportLeanbackDemos/Android.mk
+++ b/samples/SupportLeanbackDemos/Android.mk
@@ -28,8 +28,10 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v17-leanback
LOCAL_RESOURCE_DIR = \
$(LOCAL_PATH)/res \
- frameworks/support/v17/leanback/res
+ frameworks/support/v17/leanback/res \
+ frameworks/support/v7/recyclerview/res
LOCAL_AAPT_FLAGS := \
--auto-add-overlay \
- --extra-packages android.support.v17.leanback
+ --extra-packages android.support.v17.leanback \
+ --extra-packages android.support.v7.recyclerview
include $(BUILD_PACKAGE)