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

Commit 9d1aed04 authored by Omer Osman's avatar Omer Osman Committed by Android (Google) Code Review
Browse files

Merge "Update BT Stack to use BT Audio HAL V2" into tm-dev

parents 443d0bba 066fa55a

android/app/Android.bp

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

        "android.hardware.bluetooth@1.1",

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

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

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

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

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

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

    ],

    ],

    apex_available: [

    apex_available: [

        "com.android.bluetooth",

        "com.android.bluetooth",

system/audio_bluetooth_hw/Android.bp

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

    ],

    header_libs: ["libhardware_headers"],

    header_libs: ["libhardware_headers"],

    shared_libs: [

    shared_libs: [

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

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

        "libbluetooth_audio_session_aidl",

        "libbluetooth_audio_session_aidl",

        "libaudioutils",

        "libaudioutils",

        "libbase",

        "libbase",

system/audio_hal_interface/Android.bp

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

            shared_libs: [

                "libfmq",

                "libfmq",

                "libbinder_ndk",

                "libbinder_ndk",

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

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

            ],

            ],

            srcs: [

            srcs: [

                "aidl/a2dp_encoding_aidl.cc",

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

    shared_libs: [

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

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

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

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

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

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

        "libbinder_ndk",

        "libbinder_ndk",

        "libcutils",

        "libcutils",

        "libfmq",

        "libfmq",

system/audio_hal_interface/fuzzer/Android.bp

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

        "libstatslog",

        "libbinder_ndk",

        "libbinder_ndk",

        "libstatssocket",

        "libstatssocket",

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

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

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "android.hardware.bluetooth@1.1",

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

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

system/bta/Android.bp

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

        android: {

            shared_libs: [

            shared_libs: [

                "libbinder_ndk",

                "libbinder_ndk",

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

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

            ],

            ],

        },

        },

    },

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

        android: {

            shared_libs: [

            shared_libs: [

                "libbinder_ndk",

                "libbinder_ndk",

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

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

            ],

            ],

        },

        },

    },

    },