Merge "Update Spatialization and HeadTracking AIDL usage" into main (075842e4) · Commits · e / os / android_packages_modules_Bluetooth

android/app/Android.bp

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -55,7 +55,12 @@ java_library {

	cc_library_shared {		cc_library_shared {
	name: "libbluetooth_jni",		name: "libbluetooth_jni",
	defaults: ["fluoride_defaults"],		defaults: [
			"fluoride_defaults",
			"latest_android_hardware_audio_common_ndk_static",
			"latest_android_hardware_bluetooth_audio_ndk_static",
			"latest_android_media_audio_common_types_ndk_static",
			],
	srcs: ["jni/*/.cpp"],		srcs: ["jni/*/.cpp"],
	version_script: "libbluetooth_jni.map",		version_script: "libbluetooth_jni.map",
	header_libs: [		header_libs: [
	@@ -77,16 +82,13 @@ cc_library_shared {
	// is required to maintain FIPS compliance.		// is required to maintain FIPS compliance.
	stl: "libc++_static",		stl: "libc++_static",
	static_libs: [		static_libs: [
	"android.hardware.audio.common-V2-ndk",
	"android.hardware.audio.common@5.0",		"android.hardware.audio.common@5.0",
	"android.hardware.bluetooth.audio-V3-ndk",
	"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@1.0",		"android.hardware.bluetooth@1.0",
	"android.hardware.bluetooth@1.1",		"android.hardware.bluetooth@1.1",
	"android.hardware.common-V2-ndk",		"android.hardware.common-V2-ndk",
	"android.hardware.common.fmq-V1-ndk",		"android.hardware.common.fmq-V1-ndk",
	"android.media.audio.common.types-V2-ndk",
	"android.system.suspend-V1-ndk",		"android.system.suspend-V1-ndk",
	"android.system.suspend.control-V1-ndk",		"android.system.suspend.control-V1-ndk",
	"avrcp-target-service",		"avrcp-target-service",

system/audio_bluetooth_hw/Android.bp

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,11 @@ cc_defaults {

	cc_library_shared {		cc_library_shared {
	name: "audio.bluetooth.default",		name: "audio.bluetooth.default",
	defaults: ["audio_bluetooth_hw_defaults"],		defaults: [
			"audio_bluetooth_hw_defaults",
			"latest_android_hardware_audio_common_ndk_shared",
			"latest_android_hardware_bluetooth_audio_ndk_shared",
			],
	relative_install_path: "hw",		relative_install_path: "hw",
	proprietary: true,		proprietary: true,
	srcs: [		srcs: [
	@@ -32,8 +36,6 @@ cc_library_shared {
	],		],
	header_libs: ["libhardware_headers"],		header_libs: ["libhardware_headers"],
	shared_libs: [		shared_libs: [
	"android.hardware.audio.common-V2-ndk",
	"android.hardware.bluetooth.audio-V3-ndk",
	"libaudioutils",		"libaudioutils",
	"libbase",		"libbase",
	"libbinder_ndk",		"libbinder_ndk",

system/audio_hal_interface/Android.bp

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,7 @@ cc_library_static {
	target: {		target: {
	android: {		android: {
	shared_libs: [		shared_libs: [
	"android.hardware.bluetooth.audio-V3-ndk",		"android.hardware.bluetooth.audio-V4-ndk",
	"libbinder_ndk",		"libbinder_ndk",
	"libfmq",		"libfmq",
	],		],
	@@ -79,7 +79,10 @@ cc_library_static {
	// Bluetooth Audio client interface library unit tests for target and host		// Bluetooth Audio client interface library unit tests for target and host
	cc_test {		cc_test {
	name: "bluetooth-test-audio-hal-interface",		name: "bluetooth-test-audio-hal-interface",
	defaults: ["fluoride_defaults"],		defaults: [
			"fluoride_defaults",
			"latest_android_hardware_bluetooth_audio_ndk_shared",
			],
	include_dirs: [		include_dirs: [
	"packages/modules/Bluetooth/system",		"packages/modules/Bluetooth/system",
	"packages/modules/Bluetooth/system/gd",		"packages/modules/Bluetooth/system/gd",
	@@ -89,7 +92,6 @@ cc_test {
	"hidl/client_interface_hidl_unittest.cc",		"hidl/client_interface_hidl_unittest.cc",
	],		],
	shared_libs: [		shared_libs: [
	"android.hardware.bluetooth.audio-V3-ndk",
	"android.hardware.bluetooth.audio@2.0",		"android.hardware.bluetooth.audio@2.0",
	"android.hardware.bluetooth.audio@2.1",		"android.hardware.bluetooth.audio@2.1",
	"libbinder_ndk",		"libbinder_ndk",

system/audio_hal_interface/fuzzer/Android.bp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -29,9 +29,11 @@ cc_defaults {
	"avrcp_headers",		"avrcp_headers",
	"libbluetooth_headers",		"libbluetooth_headers",
	],		],
			defaults: [
			"latest_android_hardware_bluetooth_audio_ndk_shared",
			],
	shared_libs: [		shared_libs: [
	"android.hardware.bluetooth.a2dp@1.0",		"android.hardware.bluetooth.a2dp@1.0",
	"android.hardware.bluetooth.audio-V3-ndk",
	"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@1.0",		"android.hardware.bluetooth@1.0",

system/btif/Android.bp

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -259,6 +259,9 @@ cc_test {
	defaults: [		defaults: [
	"bluetooth_gtest_x86_asan_workaround",		"bluetooth_gtest_x86_asan_workaround",
	"fluoride_defaults",		"fluoride_defaults",
			"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",
	],		],
	test_suites: ["general-tests"],		test_suites: ["general-tests"],
	@@ -282,14 +285,11 @@ cc_test {
	"server_configurable_flags",		"server_configurable_flags",
	],		],
	static_libs: [		static_libs: [
	"android.hardware.audio.common-V2-ndk",
	"android.hardware.bluetooth.a2dp@1.0",		"android.hardware.bluetooth.a2dp@1.0",
	"android.hardware.bluetooth.audio-V3-ndk",
	"android.hardware.bluetooth@1.0",		"android.hardware.bluetooth@1.0",
	"android.hardware.bluetooth@1.1",		"android.hardware.bluetooth@1.1",
	"android.hardware.common-V2-ndk",		"android.hardware.common-V2-ndk",
	"android.hardware.common.fmq-V1-ndk",		"android.hardware.common.fmq-V1-ndk",
	"android.media.audio.common.types-V2-ndk",
	"android.system.suspend.control-V1-ndk",		"android.system.suspend.control-V1-ndk",
	"libFraunhoferAAC",		"libFraunhoferAAC",
	"libbluetooth-types",		"libbluetooth-types",
	@@ -541,6 +541,9 @@ cc_test {
	defaults: [		defaults: [
	"bluetooth_gtest_x86_asan_workaround",		"bluetooth_gtest_x86_asan_workaround",
	"fluoride_defaults",		"fluoride_defaults",
			"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",
	],		],
	test_suites: ["general-tests"],		test_suites: ["general-tests"],
	@@ -654,11 +657,8 @@ cc_test {
	target: {		target: {
	android: {		android: {
	static_libs: [		static_libs: [
	"android.hardware.audio.common-V2-ndk",
	"android.hardware.bluetooth.audio-V3-ndk",
	"android.hardware.common-V2-ndk",		"android.hardware.common-V2-ndk",
	"android.hardware.common.fmq-V1-ndk",		"android.hardware.common.fmq-V1-ndk",
	"android.media.audio.common.types-V2-ndk",
	],		],
	shared_libs: [		shared_libs: [
	"libbinder_ndk",		"libbinder_ndk",
	@@ -680,6 +680,9 @@ cc_test {
	defaults: [		defaults: [
	"bluetooth_gtest_x86_asan_workaround",		"bluetooth_gtest_x86_asan_workaround",
	"fluoride_defaults",		"fluoride_defaults",
			"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",
	],		],
	test_suites: ["general-tests"],		test_suites: ["general-tests"],
	@@ -792,11 +795,8 @@ cc_test {
	target: {		target: {
	android: {		android: {
	static_libs: [		static_libs: [
	"android.hardware.audio.common-V2-ndk",
	"android.hardware.bluetooth.audio-V3-ndk",
	"android.hardware.common-V2-ndk",		"android.hardware.common-V2-ndk",
	"android.hardware.common.fmq-V1-ndk",		"android.hardware.common.fmq-V1-ndk",
	"android.media.audio.common.types-V2-ndk",
	],		],
	shared_libs: [		shared_libs: [
	"libbinder_ndk",		"libbinder_ndk",