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

Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev

Browse Source
This commit is contained in:
Jeff Brown
2013-07-09 23:44:58 +00:00
committed by Android (Google) Code Review
parent 7167a054a8 a18be3116a
commit 8b51a39fda
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/Android.mk
View File

@@ -122,6 +122,7 @@ ANDROID_SUPPORT_LIBRARIES := \
android-support-v4 \ android-support-v4 \
android-support-v7-gridlayout \ android-support-v7-gridlayout \
android-support-v7-appcompat \ android-support-v7-appcompat \
android-support-v7-mediarouter \
android-support-v13 android-support-v13
$(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library,$(lib)))) $(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library,$(lib))))

11
build/sdk.atree
View File

@@ -270,6 +270,17 @@ frameworks/support/v7/appcompat/res
frameworks/support/v7/appcompat/src/.readme extras/android/support/v7/appcompat/src/.readme frameworks/support/v7/appcompat/src/.readme extras/android/support/v7/appcompat/src/.readme
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-appcompat_intermediates/android-support-v7-appcompat.jar extras/android/support/v7/appcompat/libs/android-support-v7-appcompat.jar ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-appcompat_intermediates/android-support-v7-appcompat.jar extras/android/support/v7/appcompat/libs/android-support-v7-appcompat.jar
frameworks/support/v7/mediarouter/README.txt extras/android/support/v7/mediarouter/README.txt
frameworks/support/v7/mediarouter/.project extras/android/support/v7/mediarouter/.project
frameworks/support/v7/mediarouter/.classpath extras/android/support/v7/mediarouter/.classpath
frameworks/support/v7/mediarouter/AndroidManifest.xml extras/android/support/v7/mediarouter/AndroidManifest.xml
frameworks/support/v7/mediarouter/project.properties extras/android/support/v7/mediarouter/project.properties
frameworks/support/v7/mediarouter/res extras/android/support/v7/mediarouter/res
frameworks/support/v7/mediarouter/src/.readme extras/android/support/v7/mediarouter/src/.readme
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-mediarouter_intermediates/android-support-v7-mediarouter.jar extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
development/samples/Support7Demos extras/android/support/samples/Support7Demos
############################################################################## ##############################################################################
# Tests Component # Tests Component
############################################################################## ##############################################################################