diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-07-09 23:44:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-09 23:44:58 +0000 |
| commit | 8b51a39fda458039e68b650eb46f90b95f4bddca (patch) | |
| tree | 69c4ac0dd305b66c85a49fbadd02af24b76ad3ae | |
| parent | 7167a054a8027f75025c865322fa84791a9b3bd1 (diff) | |
| parent | a18be3116aeb5f49b4f20d499b260a3ebc6f6cde (diff) | |
Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
| -rw-r--r-- | build/Android.mk | 1 | ||||
| -rw-r--r-- | build/sdk.atree | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/build/Android.mk b/build/Android.mk index 028b2f5dd..6d798dec7 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -122,6 +122,7 @@ ANDROID_SUPPORT_LIBRARIES := \ android-support-v4 \ android-support-v7-gridlayout \ android-support-v7-appcompat \ + android-support-v7-mediarouter \ android-support-v13 $(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library,$(lib)))) diff --git a/build/sdk.atree b/build/sdk.atree index 2ef11446f..6cb6967a3 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -270,6 +270,17 @@ frameworks/support/v7/appcompat/res 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 +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 ############################################################################## |