aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorNick Chalko <nchalko@google.com>2017-05-04 14:37:34 -0700
committerNick Chalko <nchalko@google.com>2017-05-05 06:18:44 -0700
commit3dfa929b24f38ac7836450176d88ceab41dc6ac5 (patch)
tree675a324760c582713e2e0080775ea17357f75b65 /Android.mk
parentfddf3fd148c1fc94c48ee5684e47dbb56512e758 (diff)
downloadTV-3dfa929b24f38ac7836450176d88ceab41dc6ac5.tar.gz
Sync to ub-tv-dev at f0024d79653da8c8999a91f995431a645a6ff4a2
Change-Id: I4199ec04cacb4a78be58b85302a39d917658dc28
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 5a5479b6..5884c5c3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -56,9 +56,10 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v17-leanback \
icu4j-usbtuner \
lib-exoplayer \
+ lib-exoplayer-v2 \
+ lib-exoplayer-v2-ext-ffmpeg \
tv-common \
- legacy-android-test \
- junit
+
LOCAL_JAVACFLAGS := -Xlint:deprecation -Xlint:unchecked
@@ -96,16 +97,18 @@ LOCAL_SDK_VERSION := system_current
include $(BUILD_STATIC_JAVA_LIBRARY)
+
#############################################################
# Pre-built dependency jars
#############################################################
-
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
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 \
include $(BUILD_MULTI_PREBUILT)