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

Commit 499f545d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Seperate WifiTrackerLib from other components." into rvc-dev am: 7e863266 am: 5237ca2e 

Change-Id: Ife873c5ce607864f37e33cdbacb9d6630450431a
parents f0f6811c 5237ca2e

packages/SettingsLib/Android.bp

+24 −11
Original line number Diff line number Diff line
@@ -2,6 +2,30 @@ android_library { 


    name: "SettingsLib",



    defaults: [

        "SettingsLibDependenciesWithoutWifiTracker",

    ],



    // TODO(b/149540986): revert this change.

    static_libs: [

         // All other dependent components should be put in

         // "SettingsLibDependenciesWithoutWifiTracker".

        "WifiTrackerLib",

    ],



    // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES

    // LOCAL_SHARED_JAVA_LIBRARIES := androidx.lifecycle_lifecycle-common



    resource_dirs: ["res"],



    srcs: ["src/**/*.java", "src/**/*.kt"],



    min_sdk_version: "21",



}



java_defaults {

    name: "SettingsLibDependenciesWithoutWifiTracker",

    static_libs: [

        "androidx.annotation_annotation",

        "androidx.legacy_legacy-support-v4",
@@ -25,20 +49,9 @@ android_library { 
        "SettingsLibProgressBar",

        "SettingsLibAdaptiveIcon",

        "SettingsLibRadioButtonPreference",

        "WifiTrackerLib",

        "SettingsLibDisplayDensityUtils",

        "SettingsLibSchedulesProvider",

    ],



    // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES

    // LOCAL_SHARED_JAVA_LIBRARIES := androidx.lifecycle_lifecycle-common



    resource_dirs: ["res"],



    srcs: ["src/**/*.java", "src/**/*.kt"],



    min_sdk_version: "21",



}



// NOTE: Keep this module in sync with ./common.mk