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

Commit e3ab14f8 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "audio_hal_interface: Remove shared audio libs" into main am: 39928e72 am: 92355d2a 

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



Change-Id: Ib005b72b94e56958e8331b6e34482049b729db45
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a2887bb2 92355d2a

system/audio_hal_interface/Android.bp

+21 −7
Original line number Diff line number Diff line
@@ -88,7 +88,9 @@ cc_test { 
    name: "bluetooth-test-audio-hal-interface",

    defaults: [

        "fluoride_defaults",

        "latest_android_hardware_bluetooth_audio_ndk_shared",

        "latest_android_hardware_audio_common_ndk_static",

        "latest_android_hardware_bluetooth_audio_ndk_static",

        "latest_android_media_audio_common_types_ndk_static",

    ],

    include_dirs: [

        "packages/modules/Bluetooth/system",
@@ -99,8 +101,6 @@ cc_test { 
        "hidl/client_interface_hidl_unittest.cc",

    ],

    shared_libs: [

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

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

        "libbase",

        "libbinder_ndk",

        "libcutils",
@@ -110,6 +110,11 @@ cc_test { 
        "libutils",

    ],

    static_libs: [

        "android.hardware.audio.common@5.0",

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

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

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "libbluetooth_log",

        "libbt-audio-hal-interface",

        "libbt-common",
@@ -128,7 +133,9 @@ cc_test { 
    test_suites: ["general-tests"],

    defaults: [

        "fluoride_defaults",

        "latest_android_hardware_bluetooth_audio_ndk_shared",

        "latest_android_hardware_audio_common_ndk_static",

        "latest_android_hardware_bluetooth_audio_ndk_static",

        "latest_android_media_audio_common_types_ndk_static",

        "mts_defaults",

    ],

    cflags: [
@@ -174,21 +181,28 @@ cc_test { 
        "aidl/a2dp_provider_info_unittest.cc",

    ],

    shared_libs: [

        "libbase",

        "libbase",

        "libbinder_ndk",

        "libcutils",

        "libfmq",

        "libhidlbase",

        "liblog",

        "libutils",

        "server_configurable_flags",

    ],

    static_libs: [

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

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

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "bluetooth_flags_c_lib",

        "libbase",

        "libbluetooth_log",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libflagtest",

        "libfmq",

        "libgmock",

        "libosi",

    ],