summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorAnthony Hugh <ahugh@google.com>2015-08-21 20:57:03 (GMT)
committerAnthony Hugh <ahugh@google.com>2015-08-21 20:57:43 (GMT)
commit70d651e904e16723f4e55879f2e356e403fff61a (patch)
treece45ca033b0df7041a441eea71268202773c0ea8 /Android.mk
parentb7da1f5f9886ff8a4ad81b0d617d442c461ca1e5 (diff)
downloadandroid_packages_apps_PackageInstaller-70d651e904e16723f4e55879f2e356e403fff61a.zip
android_packages_apps_PackageInstaller-70d651e904e16723f4e55879f2e356e403fff61a.tar.gz
android_packages_apps_PackageInstaller-70d651e904e16723f4e55879f2e356e403fff61a.tar.bz2
Revert "Implement base version of GrantPermissions dialog"
This reverts commit b7da1f5f9886ff8a4ad81b0d617d442c461ca1e5. We can't reference vendor from this package. Need to add the references manually. Change-Id: I3ee31de110f24014100ce804b0659055b26f963b
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 9a7fcc4..5a53086 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,11 +9,12 @@ LOCAL_SRC_FILES := \
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 \
+ android-support-v17-leanback
LOCAL_RESOURCE_DIR := \
frameworks/support/v17/leanback/res \
@@ -21,10 +22,11 @@ LOCAL_RESOURCE_DIR := \
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_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
+ --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
@@ -33,6 +35,4 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-include vendor/unbundled_google/libs/wearable/wearable-support.mk
-
include $(BUILD_PACKAGE)