diff options
author | Dan Willemsen <dwillemsen@google.com> | 2017-11-07 12:46:39 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2018-05-02 10:04:38 -0700 |
commit | 67b0265c8b28fc193448de6569e7a7d53651258a (patch) | |
tree | d07d44526838f2b2ff58b58771b7e4fc349deb9d | |
parent | 57a51eb0d7e7ef0c2f19ff54342ee75363be72d2 (diff) | |
download | TV-67b0265c8b28fc193448de6569e7a7d53651258a.tar.gz |
Stop using custom prebuilt support-tv-provider
That file is going away with the latest support drop. Use
`android-support-tv-provider`, which will use the correct version of the
library that matches all the other android-support-* libraries.
Bug: 64723465
Test: mmma packages/apps/TV
Test: tapas TV; m
Change-Id: Ic250b40982a161cf3858f5c792bb3f3c37b2271e
Merged-In: Ic250b40982a161cf3858f5c792bb3f3c37b2271e
(cherry picked from commit cc8c60afeddd75ecb1e8eb6de74a16f22e9256e0)
-rw-r--r-- | Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -59,6 +59,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-annotations \ android-support-compat \ android-support-core-ui \ + android-support-tv-provider \ android-support-v7-palette \ android-support-v7-recyclerview \ android-support-v17-leanback \ @@ -66,7 +67,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ lib-exoplayer \ lib-exoplayer-v2 \ lib-exoplayer-v2-ext-ffmpeg \ - prebuilt-support-tv-provider \ tv-common \ @@ -121,7 +121,6 @@ LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \ lib-exoplayer:libs/exoplayer.jar \ lib-exoplayer-v2:libs/exoplayer_v2.jar \ lib-exoplayer-v2-ext-ffmpeg:libs/exoplayer_v2_ext_ffmpeg.jar \ - prebuilt-support-tv-provider:../../../prebuilts/sdk/current/support/tv-provider/android-support-tv-provider.jar \ include $(BUILD_MULTI_PREBUILT) |