diff options
author | Anthony Hugh <ahugh@google.com> | 2015-08-21 20:58:32 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-21 20:58:32 +0000 |
commit | 24938647726a06f636dc8c9f1195a378ebb07995 (patch) | |
tree | e7578e1fa251bc67e3bdffdd142c03c5fcbac47d /Android.mk | |
parent | f774b080f65337079a851249533c8dcca112e5aa (diff) | |
parent | 70d651e904e16723f4e55879f2e356e403fff61a (diff) | |
download | android_packages_apps_PackageInstaller-24938647726a06f636dc8c9f1195a378ebb07995.tar.gz android_packages_apps_PackageInstaller-24938647726a06f636dc8c9f1195a378ebb07995.tar.bz2 android_packages_apps_PackageInstaller-24938647726a06f636dc8c9f1195a378ebb07995.zip |
Merge "Revert "Implement base version of GrantPermissions dialog"" into cw-e-dev
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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) |