From 67b0265c8b28fc193448de6569e7a7d53651258a Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 7 Nov 2017 12:46:39 -0800 Subject: 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) --- Android.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 7970f6f1..a238b192 100644 --- a/Android.mk +++ b/Android.mk @@ -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) -- cgit v1.2.3