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

am 957fa659: resolved conflicts for merge of 9eecf3fc to master

Browse Source 
* commit '957fa659c23ed74b9d3f18b25fdf162339ee6742':
  Add new support libs into the sdk build.
This commit is contained in:
Tim Kilbourn
2014-03-13 10:14:11 -07:00
committed by Android Git Automerger
parent 620f19af47 957fa659c2
commit 933c03dfcf
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/Android.mk
View File

@@ -123,7 +123,9 @@ ANDROID_SUPPORT_LIBRARIES := \
android-support-v7-gridlayout \
android-support-v7-appcompat \
android-support-v7-mediarouter \
android-support-v7-recyclerview \
android-support-v13 \
android-support-v17-leanback \
android-support-multidex \
android-support-multidex-instrumentation

13
build/sdk.atree
View File

@@ -389,6 +389,19 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-mediarouter_intermedia
development/samples/Support7Demos extras/android/support/samples/Support7Demos
# 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
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-recyclerview_intermediates/android-support-v7-recyclerview.jar extras/android/support/v7/recyclerview/android-support-v7-recyclerview.jar
frameworks/support/v17/leanback/README.txt extras/android/support/v17/leanback/README.txt
frameworks/support/v17/leanback/.project extras/android/support/v17/leanback/.project
frameworks/support/v17/leanback/.classpath extras/android/support/v17/leanback/.classpath
frameworks/support/v17/leanback/AndroidManifest.xml extras/android/support/v17/leanback/AndroidManifest.xml
frameworks/support/v17/leanback/project.properties extras/android/support/v17/leanback/project.properties
frameworks/support/v17/leanback/res extras/android/support/v17/leanback/res
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v17-leanback_intermediates/android-support-v17-leanback.jar extras/android/support/v17/leanback/libs/android-support-v17-leanback.jar
##############################################################################
# Tests Component
##############################################################################