Skip to content
Snippets Groups Projects
Commit 81632c94 authored by Myles Watson's avatar Myles Watson
Browse files

audio_hal_interface: Remove shared audio libs

Bug: 325018304
Test: mma -j32
Flag: EXEMPT, build-only change
Change-Id: I64434205caf0f9318eac3a0c18bcffb033d4e2ee
parent f75521b1
No related branches found
No related tags found
No related merge requests found
...@@ -88,7 +88,9 @@ cc_test { ...@@ -88,7 +88,9 @@ cc_test {
name: "bluetooth-test-audio-hal-interface", name: "bluetooth-test-audio-hal-interface",
defaults: [ defaults: [
"fluoride_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: [ include_dirs: [
"packages/modules/Bluetooth/system", "packages/modules/Bluetooth/system",
...@@ -99,8 +101,6 @@ cc_test { ...@@ -99,8 +101,6 @@ cc_test {
"hidl/client_interface_hidl_unittest.cc", "hidl/client_interface_hidl_unittest.cc",
], ],
shared_libs: [ shared_libs: [
"android.hardware.bluetooth.audio@2.0",
"android.hardware.bluetooth.audio@2.1",
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"libcutils", "libcutils",
...@@ -110,6 +110,11 @@ cc_test { ...@@ -110,6 +110,11 @@ cc_test {
"libutils", "libutils",
], ],
static_libs: [ 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", "libbluetooth_log",
"libbt-audio-hal-interface", "libbt-audio-hal-interface",
"libbt-common", "libbt-common",
...@@ -128,7 +133,9 @@ cc_test { ...@@ -128,7 +133,9 @@ cc_test {
test_suites: ["general-tests"], test_suites: ["general-tests"],
defaults: [ defaults: [
"fluoride_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", "mts_defaults",
], ],
cflags: [ cflags: [
...@@ -174,21 +181,28 @@ cc_test { ...@@ -174,21 +181,28 @@ cc_test {
"aidl/a2dp_provider_info_unittest.cc", "aidl/a2dp_provider_info_unittest.cc",
], ],
shared_libs: [ shared_libs: [
"libbase", "libbinder_ndk",
"libbase",
"libcutils", "libcutils",
"libfmq", "libhidlbase",
"liblog", "liblog",
"libutils", "libutils",
"server_configurable_flags", "server_configurable_flags",
], ],
static_libs: [ 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", "bluetooth_flags_c_lib",
"libbase",
"libbluetooth_log", "libbluetooth_log",
"libbt-common", "libbt-common",
"libbt_shim_bridge", "libbt_shim_bridge",
"libchrome", "libchrome",
"libflagtest", "libflagtest",
"libfmq",
"libgmock", "libgmock",
"libosi", "libosi",
], ],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment