aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-05-07 12:32:14 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-05-07 12:32:14 -0700
commit0ff776a045d66bad07eac29720413b4e0c0a9a9d (patch)
treed07d44526838f2b2ff58b58771b7e4fc349deb9d
parent9e518ce7cb18d4bf8c9a155eb5e86e74027341a2 (diff)
parent67b0265c8b28fc193448de6569e7a7d53651258a (diff)
downloadTV-0ff776a045d66bad07eac29720413b4e0c0a9a9d.tar.gz
Stop using custom prebuilt support-tv-provider
am: 67b0265c8b Change-Id: I7f94b79c64b4a8d2d93d717bf2b1f3c358ded554
-rw-r--r--Android.mk3
1 files changed, 1 insertions, 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)