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

Commit 4fb394da authored by Neha Pattan's avatar Neha Pattan Committed by Automerger Merge Worker
Browse files

Merge "Merge "(TM-MP) Rb back compat: Base changes" into tm-mainline-prod am:... 

Merge "Merge "(TM-MP) Rb back compat: Base changes" into tm-mainline-prod am: 15a5bdb9" into udc-dev am: 19ae59af

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21472077



Change-Id: I2653654470e04dce277d82491038889d7c3a2b4c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6034dd7 19ae59af

packages/SettingsLib/ActionBarShadow/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ android_library { 
    min_sdk_version: "28",

    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

        "com.android.adservices",

        "com.android.extservices",

        "com.android.permission",

    ],

}

packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ android_library { 
        "//apex_available:platform",

        "com.android.adservices",

        "com.android.cellbroadcast",

        "com.android.extservices",

        "com.android.permission",

        "com.android.healthfitness",

    ],

packages/SettingsLib/MainSwitchPreference/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ android_library { 
        "//apex_available:platform",

        "com.android.adservices",

        "com.android.cellbroadcast",

        "com.android.extservices",

        "com.android.healthfitness",

    ],

}

packages/SettingsLib/SettingsTheme/Android.bp

+2 −6
Original line number Diff line number Diff line
@@ -9,18 +9,14 @@ package { 


android_library {

    name: "SettingsLibSettingsTheme",



    resource_dirs: ["res"],



    static_libs: [

        "androidx.preference_preference",

    ],



    static_libs: ["androidx.preference_preference"],

    sdk_version: "system_current",

    min_sdk_version: "21",

    apex_available: [

        "//apex_available:platform",

        "com.android.cellbroadcast",

        "com.android.extservices",

        "com.android.permission",

        "com.android.adservices",

        "com.android.healthfitness",

packages/SettingsLib/SettingsTransition/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ android_library { 
        "//apex_available:platform",

        "com.android.adservices",

        "com.android.cellbroadcast",

        "com.android.extservices",

        "com.android.permission",

        "com.android.healthfitness",

    ],