From 45d0ee617557bce475fa31468aa5be909f603172 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 4 May 2015 18:54:17 -0700 Subject: Add missing support library dependencies. Static library android-support-v17-leanback references symbols defined in android-support-v7-recyclerview. Previously the core build system was set up with ProGuard config "-dontwarn android.support.**" and we didn't detect the missing dependencies. That setup is dangerous and is being fixed. Bug: 20658265 Change-Id: I96f8cddb0bc486902a4df662d6aa7b2dc70135ff (cherry picked from commit c9df1ba57b4ee23c741a0387a43bca08e20dcf63) --- Android.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 4657dfee..0b2cda8b 100644 --- a/Android.mk +++ b/Android.mk @@ -8,13 +8,15 @@ LOCAL_SRC_FILES := \ src/com/android/packageinstaller/EventLogTags.logtags LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 \ - android-support-v17-leanback + android-support-v17-leanback \ + android-support-v7-recyclerview LOCAL_RESOURCE_DIR := \ - $(TOP)/frameworks/support/v17/leanback/res \ - $(LOCAL_PATH)/res + frameworks/support/v17/leanback/res \ + frameworks/support/v7/recyclerview/res \ + $(LOCAL_PATH)/res \ -LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages android.support.v17.leanback +LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages android.support.v17.leanback:android.support.v7.recyclerview LOCAL_PACKAGE_NAME := PackageInstaller LOCAL_CERTIFICATE := platform -- cgit v1.2.3