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

Commit 64949f04 authored by William Escande's avatar William Escande
Browse files

[Bluetooth apex] Use new apex name 

The Bluetooth apex name is now called com.android.btservices

Bug: 243054261
Test: Build
Change-Id: I4d48b875c254b8381c982a633e3132b6de6178aa
parent de669212

android/app/Android.bp

+5 −5
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ java_library { 




    srcs: ["lib/mapapi/**/*.java"],

    srcs: ["lib/mapapi/**/*.java"],

    apex_available: [

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    ],

    min_sdk_version: "Tiramisu",

    min_sdk_version: "Tiramisu",

    sdk_version: "module_current",

    sdk_version: "module_current",
@@ -45,7 +45,7 @@ java_library { 
    srcs: [":framework-mms-shared-srcs"],

    srcs: [":framework-mms-shared-srcs"],

    libs: ["unsupportedappusage"],

    libs: ["unsupportedappusage"],

    apex_available: [

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    ],

    min_sdk_version: "Tiramisu",

    min_sdk_version: "Tiramisu",

    sdk_version: "module_current",

    sdk_version: "module_current",
@@ -79,7 +79,7 @@ cc_library_shared { 
        scs: true,

        scs: true,

    },

    },

    apex_available: [

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    ],

    min_sdk_version: "Tiramisu",

    min_sdk_version: "Tiramisu",

}

}
@@ -155,7 +155,7 @@ android_app { 
        "android.hardware.bluetooth.audio-V2-ndk",

        "android.hardware.bluetooth.audio-V2-ndk",

    ],

    ],

    apex_available: [

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    ],

    errorprone: {

    errorprone: {

        javacflags: [

        javacflags: [
@@ -176,7 +176,7 @@ java_library { 
        ":srcs_bluetooth_protos",

        ":srcs_bluetooth_protos",

    ],

    ],

    apex_available: [

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    ],

    min_sdk_version: "Tiramisu",

    min_sdk_version: "Tiramisu",

    sdk_version: "module_current",

    sdk_version: "module_current",

apex/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -108,7 +108,7 @@ sdk { 
bootclasspath_fragment {

bootclasspath_fragment {

    name: "com.android.btservices-bootclasspath-fragment",

    name: "com.android.btservices-bootclasspath-fragment",

    contents: ["framework-bluetooth"],

    contents: ["framework-bluetooth"],

    apex_available: ["com.android.bluetooth"],

    apex_available: ["com.android.btservices"],





    // The bootclasspath_fragments that provide APIs on which this depends.

    // The bootclasspath_fragments that provide APIs on which this depends.

    fragments: [

    fragments: [
@@ -158,5 +158,5 @@ bootclasspath_fragment { 
systemserverclasspath_fragment {

systemserverclasspath_fragment {

    name: "com.android.btservices-systemserverclasspath-fragment",

    name: "com.android.btservices-systemserverclasspath-fragment",

    standalone_contents: ["service-bluetooth"],

    standalone_contents: ["service-bluetooth"],

    apex_available: ["com.android.bluetooth"],

    apex_available: ["com.android.btservices"],

}
 
}

framework/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ java_sdk_library { 
    ],

    ],





    apex_available: [

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    ],





    permitted_packages: [

    permitted_packages: [

service/Android.bp

+3 −3
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ java_library { 
    ],

    ],





    apex_available: [

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    ],

    min_sdk_version: "Tiramisu"

    min_sdk_version: "Tiramisu"

}

}
@@ -104,7 +104,7 @@ java_library { 
        "//packages/modules/Bluetooth/apex",

        "//packages/modules/Bluetooth/apex",

    ],

    ],

    apex_available: [

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    ],

    min_sdk_version: "Tiramisu"

    min_sdk_version: "Tiramisu"

}

}
@@ -123,7 +123,7 @@ java_library { 
    ],

    ],

    sdk_version: "system_server_current",

    sdk_version: "system_server_current",

    apex_available: [

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    ],

    min_sdk_version: "Tiramisu"

    min_sdk_version: "Tiramisu"

}

}

system/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -155,7 +155,7 @@ rust_protobuf { 
    source_stem: "facade",

    source_stem: "facade",

    host_supported: true,

    host_supported: true,

    apex_available: [

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    ],

    min_sdk_version: "30",

    min_sdk_version: "30",

}

}