aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorNick Chalko <nchalko@google.com>2016-02-26 13:38:57 -0800
committerNick Chalko <nchalko@google.com>2016-02-26 13:39:22 -0800
commitba5845f23b8fbc985890f892961abc8b39886611 (patch)
treeda373b9fe1955a2c7008c2e65df5ec3f5b087454 /Android.mk
parent1abddd9f6225298066094e20a6c29061b6af4590 (diff)
downloadTV-ba5845f23b8fbc985890f892961abc8b39886611.tar.gz
Sync to ub-tv-interns at cc7c29d2a24a1343498f6d95ca5a79e003e6aefe
Change-Id: I580da190231e47c65b69f425b30ec4685eb50ce4
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk13
1 files changed, 3 insertions, 10 deletions
diff --git a/Android.mk b/Android.mk
index 5628c03c..e05a21f4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,15 +21,7 @@ LOCAL_MODULE_TAGS := optional
include $(LOCAL_PATH)/version.mk
-LOCAL_BUILDCONFIG_CLASS := src/com/android/tv/BuildConfig.java
-BC_OUT_DIR := $(LOCAL_PATH)
-BC_APPLICATION_ID := "com.android.tv"
-BC_VERSION_CODE := $(version_code_package)
-BC_VERSION_NAME := "$(version_name_package)"
-include $(LOCAL_PATH)/buildconfig.mk
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
- $(LOCAL_BUILDCONFIG_CLASS)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := LiveTv
@@ -40,6 +32,7 @@ LOCAL_SDK_VERSION := system_current
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 \
@@ -71,7 +64,7 @@ ifeq ($(TARGET_BUILD_APPS),)
endif
LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/usbtuner/res
LOCAL_STATIC_JAVA_LIBRARIES += usbtuner-tvinput
-LOCAL_JNI_SHARED_LIBRARIES := libusbtuner_jni
+LOCAL_JNI_SHARED_LIBRARIES := libtunertvinput_jni
LOCAL_AAPT_FLAGS += --extra-packages com.android.usbtuner
include $(BUILD_PACKAGE)