LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 9a258bce: Revert "Revert "Add cardview to support extra package.""

Browse Source 
* commit '9a258bce2cc829e3e80acc4680d7c7fb361f1435':
  Revert "Revert "Add cardview to support extra package.""
This commit is contained in:
Xavier Ducrohet
2014-06-18 00:42:39 +00:00
committed by Android Git Automerger
parent de91aa6a87 9a258bce2c
commit c5e962866b
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/Android.mk
View File

@@ -103,8 +103,9 @@ endef
ANDROID_SUPPORT_LIBRARIES := \ ANDROID_SUPPORT_LIBRARIES := \
android-support-annotations \ android-support-annotations \
android-support-v4 \ android-support-v4 \
android-support-v7-gridlayout \
android-support-v7-appcompat \ android-support-v7-appcompat \
android-support-v7-cardview \
android-support-v7-gridlayout \
android-support-v7-mediarouter \ android-support-v7-mediarouter \
android-support-v7-palette \ android-support-v7-palette \
android-support-v7-recyclerview \ android-support-v7-recyclerview \

6
build/sdk.atree
View File

@@ -406,6 +406,12 @@ frameworks/support/v7/palette/AndroidManifest.xml
frameworks/support/v7/palette/project.properties extras/android/support/v7/palette/project.properties 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 ${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
frameworks/support/v7/cardview/AndroidManifest.xml extras/android/support/v7/cardview/AndroidManifest.xml
frameworks/support/v7/cardview/res extras/android/support/v7/cardview/res
frameworks/support/v7/cardview/src/.readme extras/android/support/v7/cardview/src/.readme
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-cardview_intermediates/android-support-v7-cardview.jar extras/android/support/v7/mediarouter/libs/android-support-v7-cardview.jar
# TODO: add .project, .classpath, etc. # TODO: add .project, .classpath, etc.
frameworks/support/v7/recyclerview/README.txt extras/android/support/v7/recyclerview/README.txt 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/AndroidManifest.xml extras/android/support/v7/recyclerview/AndroidManifest.xml