diff options
| author | 2018-01-30 18:50:45 +0000 | |
|---|---|---|
| committer | 2018-01-30 18:50:45 +0000 | |
| commit | d32110ed327477722f0b49f154bea6d0db596ab0 (patch) | |
| tree | f9391555136bc1c0c9ed24e61a9faf3db4ede30c | |
| parent | 8307014768ed59432d9af734817ba0fb73fbc496 (diff) | |
| parent | a43e216e3eb8b9cfe011cb92ab00aea11fa9da29 (diff) | |
Merge "Use the correct prebuilts for lifecycles."
| -rw-r--r-- | packages/SettingsLib/Android.mk | 4 | ||||
| -rw-r--r-- | packages/SettingsLib/common.mk | 4 | ||||
| -rw-r--r-- | packages/SystemUI/Android.mk | 4 | ||||
| -rw-r--r-- | packages/SystemUI/tests/Android.mk | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/packages/SettingsLib/Android.mk b/packages/SettingsLib/Android.mk index 69287e858532..4338d26d502b 100644 --- a/packages/SettingsLib/Android.mk +++ b/packages/SettingsLib/Android.mk @@ -14,10 +14,10 @@ LOCAL_SHARED_ANDROID_LIBRARIES := \ android-support-v7-preference \ android-support-v7-appcompat \ android-support-v14-preference \ - apptoolkit-lifecycle-runtime + android-arch-lifecycle-runtime LOCAL_SHARED_JAVA_LIBRARIES := \ - apptoolkit-lifecycle-common + android-arch-lifecycle-common LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk index 14f06254009e..3c2ca2d31888 100644 --- a/packages/SettingsLib/common.mk +++ b/packages/SettingsLib/common.mk @@ -64,7 +64,7 @@ LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.settingslib LOCAL_STATIC_JAVA_LIBRARIES += \ android-support-annotations \ android-support-v4 \ - apptoolkit-lifecycle-runtime \ - apptoolkit-lifecycle-common \ + android-arch-lifecycle-runtime \ + android-arch-lifecycle-common \ SettingsLib endif diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk index 251ae2da1215..2bcf4ef9f856 100644 --- a/packages/SystemUI/Android.mk +++ b/packages/SystemUI/Android.mk @@ -48,8 +48,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ android-slices-core \ android-slices-view \ android-slices-builders \ - apptoolkit-arch-core-runtime \ - apptoolkit-lifecycle-extensions \ + android-arch-core-runtime \ + android-arch-lifecycle-extensions \ LOCAL_STATIC_JAVA_LIBRARIES := \ SystemUI-tags \ diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk index 066cfe5862ef..936ff512b8cd 100644 --- a/packages/SystemUI/tests/Android.mk +++ b/packages/SystemUI/tests/Android.mk @@ -50,8 +50,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ android-slices-core \ android-slices-view \ android-slices-builders \ - apptoolkit-arch-core-runtime \ - apptoolkit-lifecycle-extensions \ + android-arch-core-runtime \ + android-arch-lifecycle-extensions \ LOCAL_STATIC_JAVA_LIBRARIES := \ metrics-helper-lib \ |