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

Commit 7a1766fe authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Gerrit Code Review
Browse files

Merge "Use 'default' for 'android.hardware.bluetooth.audio'" into main

parents f3b64def 0b75f3b2

system/audio_hal_interface/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -10,7 +10,10 @@ package { 


cc_library_static {

    name: "libbt-audio-hal-interface",

    defaults: ["fluoride_defaults"],

    defaults: [

        "fluoride_defaults",

        "latest_android_hardware_bluetooth_audio_ndk_android_shared",

    ],

    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/bta/include",
@@ -33,7 +36,6 @@ cc_library_static { 
    target: {

        android: {

            shared_libs: [

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

                "libbinder_ndk",

                "libfmq",

            ],

system/test/headless/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ cc_binary { 
    defaults: [

        "fluoride_defaults",

        "latest_android_hardware_audio_common_ndk_static",

        "latest_android_hardware_bluetooth_audio_ndk_android_static",

        "latest_android_hardware_bluetooth_audio_ndk_static",

        "latest_android_media_audio_common_types_ndk_static",

    ],
@@ -140,7 +141,6 @@ cc_binary { 
    target: {

        android: {

            static_libs: [

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

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

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

                "android.hardware.bluetooth@1.0",