From f2736bd4fb3df44ac03385162b9f8d1bf4cb9b61 Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Thu, 25 Jun 2015 15:15:15 -0700 Subject: Migrate package installer permissions fragments to preference support lib. In order to allow for TV-friendly layouts, this migrates the permissions fragments to the preference support lib, and modifies the necessary layouts and themes to make them work on TV. b/22043727 b/22045650 b/22044940 Change-Id: Ic862effe2c126da78c304983fd06e017c3ee4472 --- Android.mk | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 0b2cda8b..d46c7f33 100644 --- a/Android.mk +++ b/Android.mk @@ -7,16 +7,26 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ src/com/android/packageinstaller/EventLogTags.logtags -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 \ - android-support-v17-leanback \ - android-support-v7-recyclerview +LOCAL_STATIC_JAVA_LIBRARIES += \ + android-support-v4 \ + android-support-v7-recyclerview \ + android-support-v7-preference \ + android-support-v7-appcompat \ + android-support-v14-preference \ + android-support-v17-preference-leanback \ + android-support-v17-leanback LOCAL_RESOURCE_DIR := \ frameworks/support/v17/leanback/res \ + frameworks/support/v7/preference/res \ + frameworks/support/v14/preference/res \ + frameworks/support/v17/preference-leanback/res \ + frameworks/support/v7/appcompat/res \ frameworks/support/v7/recyclerview/res \ - $(LOCAL_PATH)/res \ + $(LOCAL_PATH)/res -LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages android.support.v17.leanback:android.support.v7.recyclerview +LOCAL_AAPT_FLAGS := --auto-add-overlay \ + --extra-packages android.support.v17.leanback:android.support.v7.preference:android.support.v14.preference:android.support.v17.preference:android.support.v7.appcompat:android.support.v7.recyclerview LOCAL_PACKAGE_NAME := PackageInstaller LOCAL_CERTIFICATE := platform -- cgit v1.2.3