From 34d8ff4c6af66fe75fea70c4932c51e3ddb35b03 Mon Sep 17 00:00:00 2001 From: Chris Banes Date: Mon, 19 May 2014 15:09:16 +0100 Subject: [PATCH] DO NOT MERGE Add android-support-v7-palette to build Change-Id: I22cec92b976645d766441b140a5d5754c4ebbe46 (cherry picked from commit 8028b3925294a477d3fa44d948d8aba89b9efc50) --- build/Android.mk | 1 + build/sdk.atree | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/build/Android.mk b/build/Android.mk index 6b0c4c519..840bc7b48 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -128,6 +128,7 @@ ANDROID_SUPPORT_LIBRARIES := \ android-support-v7-gridlayout \ android-support-v7-appcompat \ android-support-v7-mediarouter \ + android-support-v7-palette \ android-support-v7-recyclerview \ android-support-v13 \ android-support-v17-leanback \ diff --git a/build/sdk.atree b/build/sdk.atree index 49b13aea3..395c3ab31 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -399,6 +399,13 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-mediarouter_intermedia development/samples/Support7Demos extras/android/support/samples/Support7Demos +frameworks/support/v7/palette/README.txt extras/android/support/v7/palette/README.txt +frameworks/support/v7/palette/.project extras/android/support/v7/palette/.project +frameworks/support/v7/palette/.classpath extras/android/support/v7/palette/.classpath +frameworks/support/v7/palette/AndroidManifest.xml extras/android/support/v7/palette/AndroidManifest.xml +frameworks/support/v7/palette/project.properties extras/android/support/v7/palette/project.properties +${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-palette_intermediates/android-support-v7-palette.jar extras/android/support/v7/palette/libs/android-support-v7-palette.jar + # 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