diff options
author | Dake Gu <dake@google.com> | 2017-11-08 15:35:34 -0800 |
---|---|---|
committer | Dake Gu <dake@google.com> | 2017-11-08 15:54:51 -0800 |
commit | d0b4dee914668ad32185d82146947cacade657e2 (patch) | |
tree | 2246b23180084c443d10dc6c147156d0b681a088 /Android.mk | |
parent | cc8c60afeddd75ecb1e8eb6de74a16f22e9256e0 (diff) | |
download | TV-d0b4dee914668ad32185d82146947cacade657e2.tar.gz |
convert LiveTv to aapt2
To avoid hardcode resource directories.
Bug: NA
Test: make
Change-Id: If8778b8c293eb10818baa1dead38d8ac3ee30cb3
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 42 |
1 files changed, 14 insertions, 28 deletions
@@ -36,26 +36,23 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_SDK_VERSION := system_current LOCAL_MIN_SDK_VERSION := 23 # M + +LOCAL_USE_AAPT2 := true + LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res \ - $(LOCAL_PATH)/usbtuner-res \ - $(LOCAL_PATH)/common/res - -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_PATH)/usbtuner-res + LOCAL_SRC_FILES += \ src/com/android/tv/tuner/exoplayer/ffmpeg/IFfmpegDecoder.aidl LOCAL_STATIC_JAVA_LIBRARIES := \ + icu4j-usbtuner \ + lib-exoplayer \ + lib-exoplayer-v2 \ + lib-exoplayer-v2-ext-ffmpeg + +LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-annotations \ android-support-compat \ android-support-core-ui \ @@ -63,23 +60,11 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-v7-palette \ android-support-v7-recyclerview \ android-support-v17-leanback \ - icu4j-usbtuner \ - lib-exoplayer \ - lib-exoplayer-v2 \ - lib-exoplayer-v2-ext-ffmpeg \ - tv-common \ - - - - + tv-common LOCAL_JAVACFLAGS := -Xlint:deprecation -Xlint:unchecked -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 \ +LOCAL_AAPT_FLAGS += \ --version-name "$(version_name_package)" \ --version-code $(version_code_package) \ @@ -127,3 +112,4 @@ include $(BUILD_MULTI_PREBUILT) include $(call all-makefiles-under,$(LOCAL_PATH)) + |