diff options
author | Nick Chalko <nchalko@google.com> | 2015-11-04 15:15:29 -0800 |
---|---|---|
committer | Nick Chalko <nchalko@google.com> | 2015-11-10 13:59:03 -0800 |
commit | 7d67089aa1e9aa2123c3cd2f386d7019a1544db1 (patch) | |
tree | 6f90c2065a853628dd7704788dd41b787acb6fae /Android.mk | |
parent | 07b043dc3db83d6d20f0e8513b946830ab00e37b (diff) | |
download | TV-7d67089aa1e9aa2123c3cd2f386d7019a1544db1.tar.gz |
Sync to ub-tv-glee at 1.07.007
hash dce17da9f45fc4304787b1898d9915511b1df954
Change-Id: I08ac6fc0123a6653644281155e35c11b71bc5fa0
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -31,7 +31,7 @@ include $(LOCAL_PATH)/buildconfig.mk LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(LOCAL_BUILDCONFIG_CLASS) -LOCAL_PACKAGE_NAME := TV +LOCAL_PACKAGE_NAME := LiveTv # It is required for com.android.providers.tv.permission.ALL_EPG_DATA LOCAL_PRIVILEGED_MODULE := true @@ -40,6 +40,7 @@ LOCAL_SDK_VERSION := system_current LOCAL_RESOURCE_DIR := \ $(TOP)/prebuilts/sdk/current/support/v7/recyclerview/res \ $(TOP)/prebuilts/sdk/current/support/v17/leanback/res \ + $(LOCAL_PATH)/common/res \ $(LOCAL_PATH)/res LOCAL_STATIC_JAVA_LIBRARIES := \ @@ -50,20 +51,19 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-v17-leanback \ tv-common - LOCAL_JAVACFLAGS := -Xlint:deprecation -Xlint:unchecked LOCAL_AAPT_FLAGS := --auto-add-overlay \ --extra-packages android.support.v7.recyclerview \ --extra-packages android.support.v17.leanback \ + --extra-packages com.android.tv.common \ --version-name "$(version_name_package)" \ --version-code $(version_code_package) \ LOCAL_PROGUARD_FLAG_FILES := proguard.flags - include $(BUILD_PACKAGE) include $(call all-makefiles-under,$(LOCAL_PATH)) |