diff options
| author | Ying Wang <wangying@google.com> | 2015-05-04 18:54:17 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-05-05 17:34:23 +0000 |
| commit | 45d0ee617557bce475fa31468aa5be909f603172 (patch) | |
| tree | ced7ed5fedc270d342459ca5f65933c341a5fe50 /Android.mk | |
| parent | c02494e6bc2c3bf62a5284fc612fb72886c60cb0 (diff) | |
| download | android_packages_apps_PackageInstaller-45d0ee617557bce475fa31468aa5be909f603172.tar.gz android_packages_apps_PackageInstaller-45d0ee617557bce475fa31468aa5be909f603172.tar.bz2 android_packages_apps_PackageInstaller-45d0ee617557bce475fa31468aa5be909f603172.zip | |
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)
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -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 |