diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-05 07:30:20 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-05 07:30:20 +0000 |
| commit | bb2e798ef4d546dd54cd9e95796403062b860c15 (patch) | |
| tree | d31e2adc1f9cce4f27ca07d30bee921032e33a3c /Android.mk | |
| parent | bc7f430decab0bc34a533811efe457d4615f28aa (diff) | |
| parent | 6ebde20b03db4c0d57f67acaac11832b610b966b (diff) | |
| download | TV-558bd65ef38c7637206063781db93949a35e3ed5.tar.gz | |
Snap for 4378450 from 6ebde20b03db4c0d57f67acaac11832b610b966b to oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release
Change-Id: I07f19344c030a9c2b0fd7ba425f7bf7462575f92
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 25 |
1 files changed, 21 insertions, 4 deletions
@@ -18,6 +18,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) + LOCAL_MODULE_TAGS := optional include $(LOCAL_PATH)/version.mk @@ -28,6 +29,8 @@ LOCAL_SRC_FILES := \ LOCAL_PACKAGE_NAME := LiveTv + + # It is required for com.android.providers.tv.permission.ALL_EPG_DATA LOCAL_PRIVILEGED_MODULE := true @@ -40,29 +43,40 @@ LOCAL_RESOURCE_DIR := \ ifdef TARGET_BUILD_APPS LOCAL_RESOURCE_DIR += \ + $(TOP)/prebuilts/sdk/current/support/compat/res \ $(TOP)/prebuilts/sdk/current/support/v17/leanback/res \ $(TOP)/prebuilts/sdk/current/support/v7/recyclerview/res else # !TARGET_BUILD_APPS LOCAL_RESOURCE_DIR += \ + $(TOP)/frameworks/support/compat/res \ $(TOP)/frameworks/support/v17/leanback/res \ $(TOP)/frameworks/support/v7/recyclerview/res endif +LOCAL_SRC_FILES += \ + src/com/android/tv/tuner/exoplayer/ffmpeg/IFfmpegDecoder.aidl LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-annotations \ - android-support-v4 \ + android-support-compat \ + android-support-core-ui \ android-support-v7-palette \ android-support-v7-recyclerview \ android-support-v17-leanback \ icu4j-usbtuner \ lib-exoplayer \ + lib-exoplayer-v2 \ + lib-exoplayer-v2-ext-ffmpeg \ + prebuilt-support-tv-provider \ tv-common \ -LOCAL_JAVA_LIBRARIES := junit + + + LOCAL_JAVACFLAGS := -Xlint:deprecation -Xlint:unchecked -LOCAL_AAPT_FLAGS := --auto-add-overlay \ +LOCAL_AAPT_FLAGS += --auto-add-overlay \ + --extra-packages android.support.compat \ --extra-packages android.support.v7.recyclerview \ --extra-packages android.support.v17.leanback \ --extra-packages com.android.tv.common \ @@ -95,16 +109,19 @@ 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 \ + prebuilt-support-tv-provider:../../../prebuilts/sdk/current/support/tv-provider/android-support-tv-provider.jar \ include $(BUILD_MULTI_PREBUILT) |