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

Commit c4ebb1ea authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "bluetooth: Add 'defaults' for 'android_hardware_bluetooth_audio'" into... 

Merge "bluetooth: Add 'defaults' for 'android_hardware_bluetooth_audio'" into main am: f12a0763 am: 8da928b4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3091790



Change-Id: Id46a59158f797d5693204cce9d103e251fcf50ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ddb4185 8da928b4

bluetooth/audio/aidl/Android.bp

+22 −0
Original line number Diff line number Diff line
@@ -105,3 +105,25 @@ cc_defaults { 
        latest_android_hardware_bluetooth_audio + "-ndk",

    ],

}



cc_defaults {

    name: "latest_android_hardware_bluetooth_audio_ndk_android_shared",

    target: {

        android: {

            shared_libs: [

                latest_android_hardware_bluetooth_audio + "-ndk",

            ],

        },

    },

}



cc_defaults {

    name: "latest_android_hardware_bluetooth_audio_ndk_android_static",

    target: {

        android: {

            static_libs: [

                latest_android_hardware_bluetooth_audio + "-ndk",

            ],

        },

    },

}

bluetooth/audio/utils/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ cc_library_shared { 


cc_test {

    name: "BluetoothLeAudioCodecsProviderTest",

    defaults: [

        "latest_android_hardware_bluetooth_audio_ndk_shared",

    ],

    srcs: [

        "aidl_session/BluetoothLeAudioCodecsProvider.cpp",

        "aidl_session/BluetoothLeAudioCodecsProviderTest.cpp",
@@ -100,7 +103,6 @@ cc_test { 
    shared_libs: [

        "libbase",

        "libbinder_ndk",

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

        "libxml2",

    ],

    test_suites: [