From 6ebde20b03db4c0d57f67acaac11832b610b966b Mon Sep 17 00:00:00 2001 From: Nick Chalko Date: Tue, 3 Oct 2017 10:16:37 -0700 Subject: Sync to match Live Channels 1.15(ncis) aka ub-tv-dev at a73a150bb7d0d1ce867ef980c6ac8411899d40ad Bug: 64021596 Change-Id: I7c544fd15e2c58784f8babc31877ad0dfeebb4c0 (cherry picked from commit 633eb826b8c97731dfc5ef12c7bf78a63734275d) --- common/Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'common/Android.mk') diff --git a/common/Android.mk b/common/Android.mk index bd4d99bc..d632597f 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -10,17 +10,20 @@ LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := system_current LOCAL_RESOURCE_DIR := \ + $(TOP)/prebuilts/sdk/current/support/compat/res \ $(TOP)/prebuilts/sdk/current/support/v7/recyclerview/res \ $(TOP)/prebuilts/sdk/current/support/v17/leanback/res \ $(LOCAL_PATH)/res \ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-annotations \ - android-support-v4 \ + android-support-compat \ + android-support-core-ui \ android-support-v7-recyclerview \ android-support-v17-leanback \ LOCAL_AAPT_FLAGS := --auto-add-overlay \ + --extra-packages android.support.compat \ --extra-packages android.support.v7.recyclerview \ --extra-packages android.support.v17.leanback \ -- cgit v1.2.3