Merge "net_test_stack: Remove shared audio dependencies" into main (6720eaef) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/Android.bp

+23 −11

Original line number	Original line	Diff line number	Diff line
	@@ -671,7 +671,7 @@ cc_test {
	defaults: [		defaults: [
	"fluoride_defaults",		"fluoride_defaults",
	"latest_android_hardware_audio_common_ndk_static",		"latest_android_hardware_audio_common_ndk_static",
	"latest_android_hardware_bluetooth_audio_ndk_shared",		"latest_android_hardware_bluetooth_audio_ndk_static",
	"latest_android_media_audio_common_types_ndk_static",		"latest_android_media_audio_common_types_ndk_static",
	"mts_defaults",		"mts_defaults",
	],		],
	@@ -689,17 +689,12 @@ cc_test {
	"test/stack_avrcp_test.cc",		"test/stack_avrcp_test.cc",
	],		],
	shared_libs: [		shared_libs: [
	"android.hardware.bluetooth.audio@2.0",
	"android.hardware.bluetooth.audio@2.1",
	"libPlatformProperties",		"libPlatformProperties",
	"libaaudio",		"libaaudio",
	"libbase",
	"libbinder_ndk",
	"libcrypto",		"libcrypto",
	"libcutils",		"libcutils",
	"libdl",		"libdl",
	"libevent",		"libevent",
	"libfmq",
	"libhidlbase",		"libhidlbase",
	"liblog",		"liblog",
	"libstatssocket",		"libstatssocket",
	@@ -708,16 +703,19 @@ cc_test {
	"server_configurable_flags",		"server_configurable_flags",
	],		],
	static_libs: [		static_libs: [
			"android.hardware.audio.common@5.0",
	"android.hardware.bluetooth.a2dp@1.0",		"android.hardware.bluetooth.a2dp@1.0",
	"android.hardware.bluetooth@1.0",		"android.hardware.bluetooth.audio@2.0",
	"android.hardware.bluetooth@1.1",		"android.hardware.bluetooth.audio@2.1",
	"android.hardware.common-V2-ndk",		"android.hardware.common-V2-ndk",
	"android.hardware.common.fmq-V1-ndk",		"android.hardware.common.fmq-V1-ndk",
	"android.system.suspend-V1-ndk",		"android.system.suspend-V1-ndk",
	"android.system.suspend.control-V1-ndk",		"android.system.suspend.control-V1-ndk",
	"libFraunhoferAAC",		"libFraunhoferAAC",
	"libaudio-a2dp-hw-utils",		"libaudio-a2dp-hw-utils",
			"libbase",
	"libbluetooth-dumpsys",		"libbluetooth-dumpsys",
			"libbluetooth-for-tests",
	"libbluetooth-gdx",		"libbluetooth-gdx",
	"libbluetooth-types",		"libbluetooth-types",
	"libbluetooth_core_rs",		"libbluetooth_core_rs",
	@@ -740,6 +738,7 @@ cc_test {
	"libbtif",		"libbtif",
	"libbtif-core",		"libbtif-core",
	"libchrome",		"libchrome",
			"libfmq",
	"libg722codec",		"libg722codec",
	"liblc3",		"liblc3",
	"libopus",		"libopus",
	@@ -748,9 +747,22 @@ cc_test {
	"libstatslog_bt",		"libstatslog_bt",
	"libudrv-uipc",		"libudrv-uipc",
	],		],
	whole_static_libs: [		target: {
	"libbluetooth-for-tests",		android: {
			shared_libs: [
			"libbinder_ndk",
			],
			static_libs: [
			"android.hardware.bluetooth@1.0",
			"android.hardware.bluetooth@1.1",
	],		],
			},
			host: {
			static_libs: [
			"libbinder_ndk",
			],
			},
			},
	header_libs: ["libbluetooth_headers"],		header_libs: ["libbluetooth_headers"],
	}		}