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

Commit 1724b4ea authored by Jacky Wang's avatar Jacky Wang
Browse files

[SettingsLib] Manage apex_available consistently via java_defaults 

Bug: 332201912
Flag: EXEMPT bp files
Test: built
Change-Id: I92cb3bf0944f23d043bbab6468a59e4ef7cc35ac
parent ce443373

packages/SettingsLib/ActionBarShadow/Android.bp

+1 −6
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ android_library { 
    name: "SettingsLibActionBarShadow",

    use_resource_processor: true,

    defaults: [

        "SettingsLibApexDefaults",

        "SettingsLintDefaults",

    ],
@@ -24,10 +25,4 @@ android_library { 


    sdk_version: "system_current",

    min_sdk_version: "28",

    apex_available: [

        "//apex_available:platform",

        "com.android.adservices",

        "com.android.extservices",

        "com.android.permission",

    ],

}

packages/SettingsLib/ActivityEmbedding/Android.bp

+2 −7
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ android_library { 
    name: "SettingsLibActivityEmbedding",

    use_resource_processor: true,

    defaults: [

        "SettingsLibApexDefaults",

        "SettingsLintDefaults",

    ],
@@ -25,14 +26,8 @@ android_library { 
    min_sdk_version: "21",

    // TODO(b/228508619) Remove the optional uses after fixing upstream

    optional_uses_libs: [

        "org.apache.http.legacy",

        "androidx.window.extensions",

        "androidx.window.sidecar",

    ],



    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

        "com.android.healthfitness",

        "org.apache.http.legacy",

    ],

}

packages/SettingsLib/Android.bp

+16 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ package { 
android_library {

    name: "SettingsLib",

    defaults: [

        "SettingsLibApexDefaults",

        "SettingsLintDefaults",

    ],
@@ -93,6 +94,21 @@ java_defaults { 
    },

}



// defaults for apex_available

java_defaults {

    name: "SettingsLibApexDefaults",

    apex_available: [

        "//apex_available:platform",

        "com.android.adservices",

        "com.android.cellbroadcast",

        "com.android.devicelock",

        "com.android.extservices",

        "com.android.healthfitness",

        "com.android.mediaprovider",

        "com.android.permission",

    ],

}



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

java_defaults {

    name: "SettingsLibDefaults",

packages/SettingsLib/AppPreference/Android.bp

+2 −6
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ android_library { 
    name: "SettingsLibAppPreference",

    use_resource_processor: true,

    defaults: [

        "SettingsLibApexDefaults",

        "SettingsLintDefaults",

    ],
@@ -18,15 +19,10 @@ android_library { 
    resource_dirs: ["res"],



    static_libs: [

        "SettingsLibSettingsTheme",

        "androidx.annotation_annotation",

        "androidx.preference_preference",

        "SettingsLibSettingsTheme",

    ],

    sdk_version: "system_current",

    min_sdk_version: "21",

    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

        "com.android.healthfitness",

    ],

}

packages/SettingsLib/BannerMessagePreference/Android.bp

+1 −5
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ android_library { 
    name: "SettingsLibBannerMessagePreference",

    use_resource_processor: true,

    defaults: [

        "SettingsLibApexDefaults",

        "SettingsLintDefaults",

    ],
@@ -28,9 +29,4 @@ android_library { 


    sdk_version: "system_current",

    min_sdk_version: "28",

    apex_available: [

        "//apex_available:platform",

        "com.android.healthfitness",

        "com.android.permission",

    ],

}