Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a43e216e authored by Aurimas Liutikas's avatar Aurimas Liutikas
Browse files

Use the correct prebuilts for lifecycles. 

This change should have no effect on the app. It is simply unifying some of the prebuilts.

Bug: 72566647
Change-Id: Ic748f8f425e8c8e44bacf62ea61b9af307774911
parent 94713885

packages/SettingsLib/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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

packages/SettingsLib/common.mk

+2 −2
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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 \

packages/SystemUI/tests/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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 \