diff options
| author | Doris Ling <dling@google.com> | 2018-03-15 14:28:33 -0700 |
|---|---|---|
| committer | Doris Ling <dling@google.com> | 2018-03-15 14:29:44 -0700 |
| commit | ebb458309f898b2a19c2e78032f7adf6cd6c20b4 (patch) | |
| tree | b17fcda1b14e9e5fe656c9f83a5aae1c2fbe580b | |
| parent | 6d39e55020cfb09b89396d6d9e38ba8e389ebf09 (diff) | |
Use the correct prebuilts for lifecycles.
The previous change has been reverted due to the proguard issue. That
has been fixed, and we should now re-apply this change.
Change-Id: I2ea5573284488bc0cb3871d4b36221a79fe28181
Fixes: 74834445
Test: make RunSettingsRoboTests
| -rw-r--r-- | packages/SettingsLib/common.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk index 15b50d719291..28f97d1948bd 100644 --- a/packages/SettingsLib/common.mk +++ b/packages/SettingsLib/common.mk @@ -16,11 +16,11 @@ ifeq ($(LOCAL_USE_AAPT2),true) LOCAL_STATIC_JAVA_LIBRARIES += \ android-support-annotations \ - apptoolkit-lifecycle-common + android-arch-lifecycle-common LOCAL_STATIC_ANDROID_LIBRARIES += \ android-support-v4 \ - apptoolkit-lifecycle-runtime \ + android-arch-lifecycle-runtime \ android-support-v7-recyclerview \ android-support-v7-preference \ android-support-v7-appcompat \ |