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

Commit c9f92a82 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Bluetooth apex] Use new apex name" am: ff5712b6 am: 92c655b6 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2192139



Change-Id: I319dd255c78c3f17cf9b02ec0810e93b36d2c277
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ad27a9f8 92c655b6

android/app/Android.bp

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


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

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu",

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

    libs: ["unsupportedappusage"],

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu",

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

    },

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu",

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

    ],

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    errorprone: {

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

    ],

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu",

    sdk_version: "module_current",

apex/Android.bp

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

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

    contents: ["framework-bluetooth"],

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

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



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

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

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

    standalone_contents: ["service-bluetooth"],

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

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

}

framework/Android.bp

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



    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],



    permitted_packages: [

service/Android.bp

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



    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu"

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

    ],

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu"

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

    sdk_version: "system_server_current",

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu"

}

system/Android.bp

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

    host_supported: true,

    apex_available: [

        "com.android.bluetooth",

        "com.android.btservices",

    ],

    min_sdk_version: "30",

}