Merge "Add new aconfig dependencies" into main (864d701a) · Commits · e / os / android_packages_modules_Bluetooth

system/audio_hal_interface/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -204,6 +204,7 @@ cc_defaults {
	"libbluetooth_headers",		"libbluetooth_headers",
	],		],
	defaults: [		defaults: [
			"aconfig_lib_cc_shared_link.defaults",
	"latest_android_hardware_audio_common_ndk_static",		"latest_android_hardware_audio_common_ndk_static",
	"latest_android_hardware_bluetooth_audio_ndk_static",		"latest_android_hardware_bluetooth_audio_ndk_static",
	"latest_android_media_audio_common_types_ndk_static",		"latest_android_media_audio_common_types_ndk_static",

system/bta/Android.bp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -304,7 +304,6 @@ cc_test {
	"android.hardware.common-V2-ndk",		"android.hardware.common-V2-ndk",
	"android.hardware.common.fmq-V1-ndk",		"android.hardware.common.fmq-V1-ndk",
	"bluetooth_flags_c_lib",		"bluetooth_flags_c_lib",
	"libaconfig_storage_read_api_cc",
	"libbase",		"libbase",
	"libbluetooth-types",		"libbluetooth-types",
	"libbluetooth_crypto_toolbox",		"libbluetooth_crypto_toolbox",
	@@ -771,6 +770,7 @@ cc_test {
	name: "bluetooth_le_audio_codec_manager_test",		name: "bluetooth_le_audio_codec_manager_test",
	test_suites: ["general-tests"],		test_suites: ["general-tests"],
	defaults: [		defaults: [
			"aconfig_lib_cc_shared_link.defaults",
	"bluetooth_flatbuffer_bundler_defaults",		"bluetooth_flatbuffer_bundler_defaults",
	"fluoride_defaults",		"fluoride_defaults",
	"mts_defaults",		"mts_defaults",
	@@ -1084,6 +1084,7 @@ cc_test {
	name: "bluetooth_test_broadcaster_state_machine",		name: "bluetooth_test_broadcaster_state_machine",
	test_suites: ["general-tests"],		test_suites: ["general-tests"],
	defaults: [		defaults: [
			"aconfig_lib_cc_shared_link.defaults",
	"fluoride_bta_defaults",		"fluoride_bta_defaults",
	"mts_defaults",		"mts_defaults",
	],		],
	@@ -1151,6 +1152,7 @@ cc_test {
	name: "bluetooth_test_broadcaster",		name: "bluetooth_test_broadcaster",
	test_suites: ["general-tests"],		test_suites: ["general-tests"],
	defaults: [		defaults: [
			"aconfig_lib_cc_shared_link.defaults",
	"bluetooth_flatbuffer_bundler_defaults",		"bluetooth_flatbuffer_bundler_defaults",
	"fluoride_bta_defaults",		"fluoride_bta_defaults",
	"mts_defaults",		"mts_defaults",

system/gd/Android.bp

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -175,6 +175,9 @@ cc_defaults {
	"libbluetooth_ras_pdl",		"libbluetooth_ras_pdl",
	"libbluetooth_smp_pdl",		"libbluetooth_smp_pdl",
	],		],
			static_rlibs: [
			"libbt_shim_ffi",
			],
	static_libs: [		static_libs: [
	"libaconfig_storage_read_api_cc",		"libaconfig_storage_read_api_cc",
	"libbase",		"libbase",
	@@ -187,7 +190,6 @@ cc_defaults {
	"libbt-common",		"libbt-common",
	"libbt-platform-protos-lite",		"libbt-platform-protos-lite",
	"libbt_shim_bridge",		"libbt_shim_bridge",
	"libbt_shim_ffi",
	"libcom.android.sysprop.bluetooth.wrapped",		"libcom.android.sysprop.bluetooth.wrapped",
	"libosi",		"libosi",
	"server_configurable_flags",		"server_configurable_flags",
	@@ -526,6 +528,7 @@ cc_test {
	name: "bluetooth_test_gdx_unit",		name: "bluetooth_test_gdx_unit",
	test_suites: ["device-tests"],		test_suites: ["device-tests"],
	defaults: [		defaults: [
			"aconfig_lib_cc_shared_link.defaults",
	"gd_defaults",		"gd_defaults",
	"mts_defaults",		"mts_defaults",
	],		],
	@@ -554,7 +557,6 @@ cc_test {
	"BluetoothGeneratedDumpsysTestData_h",		"BluetoothGeneratedDumpsysTestData_h",
	],		],
	static_libs: [		static_libs: [
	"libaconfig_storage_read_api_cc",
	"libbase",		"libbase",
	"libbluetooth-dumpsys",		"libbluetooth-dumpsys",
	"libbluetooth-dumpsys-test",		"libbluetooth-dumpsys-test",