diff options
| author | Youngsang Cho <youngsang@google.com> | 2016-05-11 01:20:46 +0000 |
|---|---|---|
| committer | Youngsang Cho <youngsang@google.com> | 2016-05-11 01:20:46 +0000 |
| commit | 3a72b93e554bd22a5c64e71a6956d9604ce05108 (patch) | |
| tree | 3d9a5451eb5ac85f8c18619c282eb82eb8fa2ddf /Android.mk | |
| parent | 369b6a409204a9b2a95f7ba575d7c3b7bdc94ab7 (diff) | |
| download | TV-3a72b93e554bd22a5c64e71a6956d9604ce05108.tar.gz | |
DO NOT MERGE Revert "DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4"
This reverts commit 369b6a409204a9b2a95f7ba575d7c3b7bdc94ab7.
Change-Id: I9abfc39974fa42edcc1eb6b6ec2e53782b4fcf5f
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -29,10 +29,10 @@ LOCAL_PACKAGE_NAME := LiveTv LOCAL_PRIVILEGED_MODULE := true LOCAL_SDK_VERSION := system_current -LOCAL_MIN_SDK_VERSION := 23 # M LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res \ $(LOCAL_PATH)/common/res \ + $(LOCAL_PATH)/common/res_leanback \ $(TOP)/prebuilts/sdk/current/support/v17/leanback/res \ $(TOP)/prebuilts/sdk/current/support/v7/recyclerview/res \ @@ -56,7 +56,6 @@ LOCAL_AAPT_FLAGS := --auto-add-overlay \ LOCAL_PROGUARD_FLAG_FILES := proguard.flags - LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/usbtuner/res LOCAL_STATIC_JAVA_LIBRARIES += usbtuner-tvinput LOCAL_JNI_SHARED_LIBRARIES := libtunertvinput_jni |