diff options
| author | Nick Chalko <nchalko@google.com> | 2017-05-09 14:07:44 -0700 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2017-05-10 09:49:18 -0700 |
| commit | 0550a7221be0581b0bd421a9d70400ff8699a6e7 (patch) | |
| tree | 14d9836ff9283690321c166560ee3450792236ad /Android.mk | |
| parent | 430c2be3b91676005fdd243553e38acff8dfc3de (diff) | |
| download | TV-0550a7221be0581b0bd421a9d70400ff8699a6e7.tar.gz | |
Sync to ub-tv-dev at lost+android-o-preview-3android-n-iot-preview-4n-iot-preview-4
hash 550cbec17259717c5453f6be1eb05736ba10ef1d
Bug: 37849928
Test: tested on vendor branch
Change-Id: I82190481d2bcef2b89e78414b6b92ed97720749d
Merged-In: I4199ec04cacb4a78be58b85302a39d917658dc28
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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) |