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

Commit f10973de authored by Omer Osman's avatar Omer Osman Committed by Automerger Merge Worker
Browse files

Merge "Update BT Stack to use BT Audio HAL V2" into tm-dev am: 9d1aed04 

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



Change-Id: I4c91fbfa90b55dd4bb3c6397ef443e3029c85741
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de524485 9d1aed04

android/app/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ android_app { 
        "android.hardware.bluetooth@1.1",

        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth.audio@2.1",

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

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

    ],

    apex_available: [

        "com.android.bluetooth",

system/audio_bluetooth_hw/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ cc_library_shared { 
    ],

    header_libs: ["libhardware_headers"],

    shared_libs: [

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

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

        "libbluetooth_audio_session_aidl",

        "libaudioutils",

        "libbase",

system/audio_hal_interface/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ cc_library_static { 
            shared_libs: [

                "libfmq",

                "libbinder_ndk",

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

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

            ],

            srcs: [

                "aidl/a2dp_encoding_aidl.cc",
@@ -85,7 +85,7 @@ cc_test { 
    shared_libs: [

        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth.audio@2.1",

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

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

        "libbinder_ndk",

        "libcutils",

        "libfmq",

system/audio_hal_interface/fuzzer/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ cc_defaults { 
        "libstatslog",

        "libbinder_ndk",

        "libstatssocket",

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

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

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "android.hardware.bluetooth.a2dp@1.0",

system/bta/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ cc_test { 
        android: {

            shared_libs: [

                "libbinder_ndk",

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

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

            ],

        },

    },
@@ -769,7 +769,7 @@ cc_test { 
        android: {

            shared_libs: [

                "libbinder_ndk",

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

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

            ],

        },

    },