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

Commit 8db944d2 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Clean up legacy androidx lib for SettingsLib"

parents 496afc58 c269f228

packages/SettingsLib/Android.bp

+14 −9
Original line number Diff line number Diff line
@@ -13,12 +13,15 @@ android_library { 


    static_libs: [

        "androidx.annotation_annotation",

        "androidx.legacy_legacy-support-v4",

        "androidx.recyclerview_recyclerview",

        "androidx.preference_preference",

        "androidx.appcompat_appcompat",

        "androidx.coordinatorlayout_coordinatorlayout",

        "androidx.core_core",

        "androidx.fragment_fragment",

        "androidx.lifecycle_lifecycle-runtime",

        "androidx.mediarouter_mediarouter-nodeps",

        "androidx.loader_loader",

        "androidx.localbroadcastmanager_localbroadcastmanager",

        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

        "com.google.android.material_material",

        "iconloader",
@@ -74,13 +77,15 @@ java_defaults { 
    name: "SettingsLibDefaults",

    static_libs: [

        "androidx.annotation_annotation",

        "androidx.lifecycle_lifecycle-common",

        "androidx.legacy_legacy-support-v4",

        "androidx.appcompat_appcompat",

        "androidx.coordinatorlayout_coordinatorlayout",

        "androidx.core_core",

        "androidx.fragment_fragment",

        "androidx.lifecycle_lifecycle-runtime",

        "androidx.recyclerview_recyclerview",

        "androidx.loader_loader",

        "androidx.localbroadcastmanager_localbroadcastmanager",

        "androidx.preference_preference",

        "androidx.appcompat_appcompat",

        "androidx.legacy_legacy-preference-v14",

        "androidx.recyclerview_recyclerview",

        "SettingsLib",

    ],

}

packages/SettingsLib/common.mk

+8 −6
Original line number Diff line number Diff line
@@ -19,15 +19,17 @@ 
# NOTE: keep this file and ./Android.bp in sync.



LOCAL_STATIC_JAVA_LIBRARIES += \

    androidx.annotation_annotation \

    androidx.lifecycle_lifecycle-common

    androidx.annotation_annotation



LOCAL_STATIC_ANDROID_LIBRARIES += \

    androidx.legacy_legacy-support-v4 \

    androidx.appcompat_appcompat \

    androidx.coordinatorlayout_coordinatorlayout \

    androidx.core_core \

    androidx.fragment_fragment \

    androidx.lifecycle_lifecycle-runtime \

    androidx.recyclerview_recyclerview \

    androidx.loader_loader \

    androidx.localbroadcastmanager_localbroadcastmanager \

    androidx.preference_preference \

    androidx.appcompat_appcompat \

    androidx.legacy_legacy-preference-v14 \

    androidx.recyclerview_recyclerview \

    SettingsLib