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

Commit 2407eb73 authored by Tony Mantler's avatar Tony Mantler
Browse files

Make sure Lifecycle proguard rules are used 

At least when aapt2 is enabled. Other projects will have to include
them manually.

Test: Tap build number, ensure toasts appear
Bug: 69350851
Bug: 69257739
Change-Id: I7967ecb1e38a89829e9d008ea09c56b7fb725230
parent 70164985

packages/SettingsLib/Android.mk

+3 −3
Original line number Original line Diff line number Diff line
@@ -13,11 +13,11 @@ LOCAL_SHARED_ANDROID_LIBRARIES := \ 
    android-support-v7-recyclerview \

    android-support-v7-recyclerview \

    android-support-v7-preference \

    android-support-v7-preference \

    android-support-v7-appcompat \

    android-support-v7-appcompat \

    android-support-v14-preference

    android-support-v14-preference \

    apptoolkit-lifecycle-runtime





LOCAL_SHARED_JAVA_LIBRARIES := \

LOCAL_SHARED_JAVA_LIBRARIES := \

    apptoolkit-lifecycle-common \

    apptoolkit-lifecycle-common

    apptoolkit-lifecycle-runtime





LOCAL_STATIC_JAVA_LIBRARY := legacy-android-test

LOCAL_STATIC_JAVA_LIBRARY := legacy-android-test

packages/SettingsLib/common.mk

+5 −1
Original line number Original line Diff line number Diff line
@@ -15,10 +15,12 @@ 




ifeq ($(LOCAL_USE_AAPT2),true)

ifeq ($(LOCAL_USE_AAPT2),true)

LOCAL_STATIC_JAVA_LIBRARIES += \

LOCAL_STATIC_JAVA_LIBRARIES += \

    android-support-annotations

    android-support-annotations \

    apptoolkit-lifecycle-common





LOCAL_STATIC_ANDROID_LIBRARIES += \

LOCAL_STATIC_ANDROID_LIBRARIES += \

    android-support-v4 \

    android-support-v4 \

    apptoolkit-lifecycle-runtime \

    SettingsLib

    SettingsLib

else

else

LOCAL_RESOURCE_DIR += $(call my-dir)/res

LOCAL_RESOURCE_DIR += $(call my-dir)/res
@@ -59,5 +61,7 @@ LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.settingslib 
LOCAL_STATIC_JAVA_LIBRARIES += \

LOCAL_STATIC_JAVA_LIBRARIES += \

    android-support-annotations \

    android-support-annotations \

    android-support-v4 \

    android-support-v4 \

    apptoolkit-lifecycle-runtime \

    apptoolkit-lifecycle-common \

    SettingsLib

    SettingsLib

endif
 
endif