Merge "bta: Remove shared audio dependencies" into main (4f80e703) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/Android.bp

+37 −23

Original line number	Diff line number	Diff line
		@@ -132,6 +132,9 @@ cc_library_static {
		"-fvisibility=default",
		],
		static_libs: [
		"android.hardware.audio.common@5.0",
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"avrcp-target-service",
		"bluetooth_flags_c_lib",
		"lib-bt-packets",
		@@ -145,9 +148,6 @@ cc_library_static {
		"libcom.android.sysprop.bluetooth.wrapped",
		"liblc3",
		],
		shared_libs: [
		"android.hardware.bluetooth.audio@2.1",
		],
		generated_headers: [
		"LeAudioSetConfigSchemas_h",
		],
		@@ -223,6 +223,9 @@ cc_test {
		name: "net_test_bta",
		defaults: [
		"fluoride_bta_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",
		],
		test_suites: ["general-tests"],
		@@ -270,21 +273,21 @@ cc_test {
		"BluetoothGeneratedDumpsysDataSchema_h",
		],
		shared_libs: [
		"android.hardware.bluetooth.audio-V4-ndk",
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"libbase",
		"libbinder_ndk",
		"libcrypto",
		"libcutils",
		"libfmq",
		"libhidlbase",
		"liblog",
		"libutils",
		"server_configurable_flags",
		],
		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",
		"bluetooth_flags_c_lib",
		"libbase",
		"libbluetooth-types",
		"libbluetooth_crypto_toolbox",
		"libbluetooth_gd",
		@@ -304,6 +307,7 @@ cc_test {
		"libcom.android.sysprop.bluetooth.wrapped",
		"libevent",
		"libflagtest",
		"libfmq",
		"libgmock",
		"server_configurable_flags",
		],
		@@ -317,6 +321,18 @@ cc_test {
		"-Wno-macro-redefined",
		"-Wno-unused-parameter",
		],
		target: {
		android: {
		shared_libs: [
		"libbinder_ndk",
		],
		},
		host: {
		static_libs: [
		"libbinder_ndk",
		],
		},
		},
		}

		// bta GATT unit tests
		@@ -476,7 +492,7 @@ cc_test {
		},
		target: {
		android: {
		whole_static_libs: [
		static_libs: [
		"libPlatformProperties",
		],
		},
		@@ -739,7 +755,7 @@ cc_test {
		sanitize: {
		misc_undefined: ["bounds"],
		},
		whole_static_libs: [
		static_libs: [
		"libPlatformProperties",
		],
		},
		@@ -773,8 +789,6 @@ cc_test {
		"LeAudioSetConfigSchemas_h",
		],
		shared_libs: [
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"libcrypto",
		"libhidlbase",
		"liblog", // __android_log_print
		@@ -816,7 +830,7 @@ cc_test {
		sanitize: {
		misc_undefined: ["bounds"],
		},
		whole_static_libs: [
		static_libs: [
		"libPlatformProperties",
		],
		},
		@@ -876,8 +890,6 @@ cc_test {
		"LeAudioSetConfigSchemas_h",
		],
		shared_libs: [
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"libcrypto",
		"libhidlbase",
		"liblog", // __android_log_print
		@@ -959,12 +971,8 @@ cc_test {
		"test/common/mock_device_groups.cc",
		],
		shared_libs: [
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"libbase",
		"libbinder_ndk",
		"libcrypto",
		"libfmq",
		"libhidlbase",
		"liblog",
		"server_configurable_flags",
		@@ -998,10 +1006,18 @@ cc_test {
		],
		target: {
		android: {
		whole_static_libs: [
		shared_libs: [
		"libbinder_ndk",
		],
		static_libs: [
		"libPlatformProperties",
		],
		},
		host: {
		static_libs: [
		"libbinder_ndk",
		],
		},
		},
		sanitize: {
		cfi: true,
		@@ -1109,8 +1125,6 @@ cc_test {
		"test/common/mock_controller.cc",
		],
		shared_libs: [
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"libbinder_ndk",
		"libcrypto",
		"libfmq",