Merge "[BP CLEANUP] Format bpfmt -s in system/*" (6f2f31c3) · Commits · e / os / android_packages_modules_Bluetooth

system/Android.bp

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -14,19 +14,19 @@ filegroup {
	name: "BlueberryFacadeProto",		name: "BlueberryFacadeProto",
	srcs: [		srcs: [
	"blueberry/facade/common.proto",		"blueberry/facade/common.proto",
	"blueberry/facade/rootservice.proto",
	"blueberry/facade/hal/hal_facade.proto",		"blueberry/facade/hal/hal_facade.proto",
	"blueberry/facade/hci/hci_facade.proto",
	"blueberry/facade/hci/acl_manager_facade.proto",		"blueberry/facade/hci/acl_manager_facade.proto",
	"blueberry/facade/hci/controller_facade.proto",		"blueberry/facade/hci/controller_facade.proto",
			"blueberry/facade/hci/hci_facade.proto",
	"blueberry/facade/hci/le_acl_manager_facade.proto",		"blueberry/facade/hci/le_acl_manager_facade.proto",
	"blueberry/facade/hci/le_advertising_manager_facade.proto",		"blueberry/facade/hci/le_advertising_manager_facade.proto",
	"blueberry/facade/hci/le_initiator_address_facade.proto",		"blueberry/facade/hci/le_initiator_address_facade.proto",
	"blueberry/facade/hci/le_scanning_manager_facade.proto",		"blueberry/facade/hci/le_scanning_manager_facade.proto",
	"blueberry/facade/iso/facade.proto",		"blueberry/facade/iso/facade.proto",
	"blueberry/facade/neighbor/facade.proto",
	"blueberry/facade/l2cap/classic/facade.proto",		"blueberry/facade/l2cap/classic/facade.proto",
	"blueberry/facade/l2cap/le/facade.proto",		"blueberry/facade/l2cap/le/facade.proto",
			"blueberry/facade/neighbor/facade.proto",
			"blueberry/facade/rootservice.proto",
	"blueberry/facade/security/facade.proto",		"blueberry/facade/security/facade.proto",
	"blueberry/facade/shim/facade.proto",		"blueberry/facade/shim/facade.proto",
	"blueberry/facade/topshim/facade.proto",		"blueberry/facade/topshim/facade.proto",
	@@ -46,16 +46,14 @@ genrule {
	out: [		out: [
	"blueberry/facade/common.grpc.pb.h",		"blueberry/facade/common.grpc.pb.h",
	"blueberry/facade/common.pb.h",		"blueberry/facade/common.pb.h",
	"blueberry/facade/rootservice.grpc.pb.h",
	"blueberry/facade/rootservice.pb.h",
	"blueberry/facade/hal/hal_facade.grpc.pb.h",		"blueberry/facade/hal/hal_facade.grpc.pb.h",
	"blueberry/facade/hal/hal_facade.pb.h",		"blueberry/facade/hal/hal_facade.pb.h",
	"blueberry/facade/hci/hci_facade.grpc.pb.h",
	"blueberry/facade/hci/hci_facade.pb.h",
	"blueberry/facade/hci/acl_manager_facade.grpc.pb.h",		"blueberry/facade/hci/acl_manager_facade.grpc.pb.h",
	"blueberry/facade/hci/acl_manager_facade.pb.h",		"blueberry/facade/hci/acl_manager_facade.pb.h",
	"blueberry/facade/hci/controller_facade.grpc.pb.h",		"blueberry/facade/hci/controller_facade.grpc.pb.h",
	"blueberry/facade/hci/controller_facade.pb.h",		"blueberry/facade/hci/controller_facade.pb.h",
			"blueberry/facade/hci/hci_facade.grpc.pb.h",
			"blueberry/facade/hci/hci_facade.pb.h",
	"blueberry/facade/hci/le_acl_manager_facade.grpc.pb.h",		"blueberry/facade/hci/le_acl_manager_facade.grpc.pb.h",
	"blueberry/facade/hci/le_acl_manager_facade.pb.h",		"blueberry/facade/hci/le_acl_manager_facade.pb.h",
	"blueberry/facade/hci/le_advertising_manager_facade.grpc.pb.h",		"blueberry/facade/hci/le_advertising_manager_facade.grpc.pb.h",
	@@ -72,6 +70,8 @@ genrule {
	"blueberry/facade/l2cap/le/facade.pb.h",		"blueberry/facade/l2cap/le/facade.pb.h",
	"blueberry/facade/neighbor/facade.grpc.pb.h",		"blueberry/facade/neighbor/facade.grpc.pb.h",
	"blueberry/facade/neighbor/facade.pb.h",		"blueberry/facade/neighbor/facade.pb.h",
			"blueberry/facade/rootservice.grpc.pb.h",
			"blueberry/facade/rootservice.pb.h",
	"blueberry/facade/security/facade.grpc.pb.h",		"blueberry/facade/security/facade.grpc.pb.h",
	"blueberry/facade/security/facade.pb.h",		"blueberry/facade/security/facade.pb.h",
	"blueberry/facade/shim/facade.grpc.pb.h",		"blueberry/facade/shim/facade.grpc.pb.h",
	@@ -92,16 +92,14 @@ genrule {
	out: [		out: [
	"blueberry/facade/common.grpc.pb.cc",		"blueberry/facade/common.grpc.pb.cc",
	"blueberry/facade/common.pb.cc",		"blueberry/facade/common.pb.cc",
	"blueberry/facade/rootservice.grpc.pb.cc",
	"blueberry/facade/rootservice.pb.cc",
	"blueberry/facade/hal/hal_facade.grpc.pb.cc",		"blueberry/facade/hal/hal_facade.grpc.pb.cc",
	"blueberry/facade/hal/hal_facade.pb.cc",		"blueberry/facade/hal/hal_facade.pb.cc",
	"blueberry/facade/hci/hci_facade.grpc.pb.cc",
	"blueberry/facade/hci/hci_facade.pb.cc",
	"blueberry/facade/hci/acl_manager_facade.grpc.pb.cc",		"blueberry/facade/hci/acl_manager_facade.grpc.pb.cc",
	"blueberry/facade/hci/acl_manager_facade.pb.cc",		"blueberry/facade/hci/acl_manager_facade.pb.cc",
	"blueberry/facade/hci/controller_facade.grpc.pb.cc",		"blueberry/facade/hci/controller_facade.grpc.pb.cc",
	"blueberry/facade/hci/controller_facade.pb.cc",		"blueberry/facade/hci/controller_facade.pb.cc",
			"blueberry/facade/hci/hci_facade.grpc.pb.cc",
			"blueberry/facade/hci/hci_facade.pb.cc",
	"blueberry/facade/hci/le_acl_manager_facade.grpc.pb.cc",		"blueberry/facade/hci/le_acl_manager_facade.grpc.pb.cc",
	"blueberry/facade/hci/le_acl_manager_facade.pb.cc",		"blueberry/facade/hci/le_acl_manager_facade.pb.cc",
	"blueberry/facade/hci/le_advertising_manager_facade.grpc.pb.cc",		"blueberry/facade/hci/le_advertising_manager_facade.grpc.pb.cc",
	@@ -118,6 +116,8 @@ genrule {
	"blueberry/facade/l2cap/le/facade.pb.cc",		"blueberry/facade/l2cap/le/facade.pb.cc",
	"blueberry/facade/neighbor/facade.grpc.pb.cc",		"blueberry/facade/neighbor/facade.grpc.pb.cc",
	"blueberry/facade/neighbor/facade.pb.cc",		"blueberry/facade/neighbor/facade.pb.cc",
			"blueberry/facade/rootservice.grpc.pb.cc",
			"blueberry/facade/rootservice.pb.cc",
	"blueberry/facade/security/facade.grpc.pb.cc",		"blueberry/facade/security/facade.grpc.pb.cc",
	"blueberry/facade/security/facade.pb.cc",		"blueberry/facade/security/facade.pb.cc",
	"blueberry/facade/shim/facade.grpc.pb.cc",		"blueberry/facade/shim/facade.grpc.pb.cc",
	@@ -147,9 +147,9 @@ rust_protobuf {
	crate_name: "bt_facade_proto",		crate_name: "bt_facade_proto",
	protos: ["blueberry/facade/common.proto"],		protos: ["blueberry/facade/common.proto"],
	grpc_protos: [		grpc_protos: [
			"blueberry/facade/hal/hal_facade.proto",
	"blueberry/facade/hci/controller_facade.proto",		"blueberry/facade/hci/controller_facade.proto",
	"blueberry/facade/hci/hci_facade.proto",		"blueberry/facade/hci/hci_facade.proto",
	"blueberry/facade/hal/hal_facade.proto",
	"blueberry/facade/rootservice.proto",		"blueberry/facade/rootservice.proto",
	],		],
	source_stem: "facade",		source_stem: "facade",

system/audio_a2dp_hw/Android.bp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -32,8 +32,8 @@ cc_library {
	"com.android.btservices",		"com.android.btservices",
	],		],
	shared_libs: [		shared_libs: [
	"liblog",
	"libcutils",		"libcutils",
			"liblog",
	],		],
	static_libs: [		static_libs: [
	"libbluetooth_gd",		"libbluetooth_gd",
	@@ -60,8 +60,8 @@ cc_test {
	test_suites: ["device-tests"],		test_suites: ["device-tests"],
	defaults: [		defaults: [
	"audio_a2dp_hw_defaults",		"audio_a2dp_hw_defaults",
	"mts_defaults",
	"bluetooth_gtest_x86_asan_workaround",		"bluetooth_gtest_x86_asan_workaround",
			"mts_defaults",
	],		],
	srcs: [		srcs: [
	"test/audio_a2dp_hw_test.cc",		"test/audio_a2dp_hw_test.cc",

system/audio_bluetooth_hw/Android.bp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -25,18 +25,18 @@ cc_library_shared {
	proprietary: true,		proprietary: true,
	srcs: [		srcs: [
	"audio_bluetooth_hw.cc",		"audio_bluetooth_hw.cc",
	"stream_apis.cc",
	"device_port_proxy.cc",		"device_port_proxy.cc",
	"device_port_proxy_hidl.cc",		"device_port_proxy_hidl.cc",
			"stream_apis.cc",
	"utils.cc",		"utils.cc",
	],		],
	header_libs: ["libhardware_headers"],		header_libs: ["libhardware_headers"],
	shared_libs: [		shared_libs: [
	"android.hardware.bluetooth.audio-V3-ndk",		"android.hardware.bluetooth.audio-V3-ndk",
	"libbluetooth_audio_session_aidl",
	"libaudioutils",		"libaudioutils",
	"libbase",		"libbase",
	"libbinder_ndk",		"libbinder_ndk",
			"libbluetooth_audio_session_aidl",
	"libcutils",		"libcutils",
	"libfmq",		"libfmq",
	"liblog",		"liblog",

system/audio_hal_interface/Android.bp

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -13,12 +13,12 @@ cc_library_static {
	defaults: ["fluoride_defaults"],		defaults: ["fluoride_defaults"],
	include_dirs: [		include_dirs: [
	"packages/modules/Bluetooth/system",		"packages/modules/Bluetooth/system",
	"packages/modules/Bluetooth/system/gd",
	"packages/modules/Bluetooth/system/bta/include",		"packages/modules/Bluetooth/system/bta/include",
	"packages/modules/Bluetooth/system/bta/sys",		"packages/modules/Bluetooth/system/bta/sys",
	"packages/modules/Bluetooth/system/btif/include",		"packages/modules/Bluetooth/system/btif/include",
	"packages/modules/Bluetooth/system/stack/include",		"packages/modules/Bluetooth/system/gd",
	"packages/modules/Bluetooth/system/gd/rust/shim",		"packages/modules/Bluetooth/system/gd/rust/shim",
			"packages/modules/Bluetooth/system/stack/include",
	],		],
	shared_libs: [		shared_libs: [
	"android.hardware.bluetooth.audio@2.0",		"android.hardware.bluetooth.audio@2.0",
	@@ -26,40 +26,40 @@ cc_library_static {
	"libhidlbase",		"libhidlbase",
	],		],
	static_libs: [		static_libs: [
	"libosi",
	"libbt-common",		"libbt-common",
			"libosi",
	],		],
	target: {		target: {
	android: {		android: {
	shared_libs: [		shared_libs: [
	"libfmq",
	"libbinder_ndk",
	"android.hardware.bluetooth.audio-V3-ndk",		"android.hardware.bluetooth.audio-V3-ndk",
			"libbinder_ndk",
			"libfmq",
	],		],
	srcs: [		srcs: [
			"a2dp_encoding.cc",
	"aidl/a2dp_encoding_aidl.cc",		"aidl/a2dp_encoding_aidl.cc",
	"aidl/bluetooth_audio_port_impl.cc",		"aidl/bluetooth_audio_port_impl.cc",
	"aidl/client_interface_aidl.cc",		"aidl/client_interface_aidl.cc",
	"aidl/codec_status_aidl.cc",		"aidl/codec_status_aidl.cc",
	"aidl/hearing_aid_software_encoding_aidl.cc",		"aidl/hearing_aid_software_encoding_aidl.cc",
	"aidl/le_audio_software_aidl.cc",		"aidl/le_audio_software_aidl.cc",
			"hal_version_manager.cc",
			"hearing_aid_software_encoding.cc",
	"hidl/a2dp_encoding_hidl.cc",		"hidl/a2dp_encoding_hidl.cc",
	"hidl/client_interface_hidl.cc",		"hidl/client_interface_hidl.cc",
	"hidl/codec_status_hidl.cc",		"hidl/codec_status_hidl.cc",
	"hidl/hearing_aid_software_encoding_hidl.cc",		"hidl/hearing_aid_software_encoding_hidl.cc",
	"hidl/le_audio_software_hidl.cc",		"hidl/le_audio_software_hidl.cc",
	"a2dp_encoding.cc",
	"hearing_aid_software_encoding.cc",
	"le_audio_software.cc",		"le_audio_software.cc",
	"hal_version_manager.cc",
	],		],
	},		},
	host: {		host: {
	srcs: [		srcs: [
	"a2dp_encoding_host.cc",		"a2dp_encoding_host.cc",
			"hal_version_manager_host.cc",
	"hearing_aid_software_encoding_host.cc",		"hearing_aid_software_encoding_host.cc",
	"le_audio_software_host.cc",		"le_audio_software_host.cc",
	"hal_version_manager_host.cc",
	],		],
	},		},
	},		},
	@@ -86,9 +86,9 @@ 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",
	"android.hardware.bluetooth.audio-V3-ndk",
	"libbinder_ndk",		"libbinder_ndk",
	"libcutils",		"libcutils",
	"libfmq",		"libfmq",

system/audio_hal_interface/fuzzer/Android.bp

+30 −30

Original line number	Original line	Diff line number	Diff line
	@@ -47,56 +47,56 @@ cc_defaults {
	"android.system.suspend-V1-ndk",		"android.system.suspend-V1-ndk",
	],		],
	static_libs: [		static_libs: [
	"libbte",		"libFraunhoferAAC",
	"liblog",		"libaudio-a2dp-hw-utils",
	"libosi",
	"libbtif",
	"libbtif-core",
	"libbase",		"libbase",
	"libutils",		"libbluetooth-dumpsys",
	"libevent",		"libbluetooth-protos",
	"libcutils",		"libbluetooth-types",
	"libchrome",		"libbluetooth_gd",
	"libbtcore",		"libbluetooth_rust_interop",
			"libbt-audio-hal-interface",
	"libbt-bta",		"libbt-bta",
	"libbt-bta-core",		"libbt-bta-core",
			"libbt-common",
	"libbt-hci",		"libbt-hci",
			"libbt-sbc-decoder",
			"libbt-sbc-encoder",
			"libbt-stack",
			"libbt-stack-core",
	"libbt_shim_bridge",		"libbt_shim_bridge",
	"libbt_shim_ffi",		"libbt_shim_ffi",
	"libjsoncpp",		"libbtcore",
	"libbtdevice",		"libbtdevice",
			"libbte",
			"libbtif",
			"libbtif-core",
	"libcgrouprc",		"libcgrouprc",
			"libcgrouprc_format",
			"libchrome",
			"libcutils",
			"libevent",
	"libflatbuffers-cpp",		"libflatbuffers-cpp",
	"libhidlbase",
	"libbt-stack",
	"libbt-stack-core",
	"libg722codec",		"libg722codec",
	"libudrv-uipc",		"libhidlbase",
	"libbt-common",		"libjsoncpp",
	"liblc3",		"liblc3",
			"liblog",
	"libopus",		"libopus",
			"libosi",
			"libprotobuf-cpp-lite",
	"libstatslog_bt",		"libstatslog_bt",
			"libudrv-uipc",
			"libutils",
	"libvndksupport",		"libvndksupport",
	"libbluetooth_gd",
	"libFraunhoferAAC",
	"libbt-sbc-decoder",
	"libbt-sbc-encoder",
	"libcgrouprc_format",
	"libbluetooth-types",
	"libbluetooth-protos",
	"libbluetooth-dumpsys",
	"libprotobuf-cpp-lite",
	"libbt-audio-hal-interface",
	"libbluetooth_rust_interop",
	"libaudio-a2dp-hw-utils",
	],		],
	include_dirs: [		include_dirs: [
	"packages/modules/Bluetooth/system",		"packages/modules/Bluetooth/system",
	"packages/modules/Bluetooth/system/gd",		"packages/modules/Bluetooth/system/bta/include",
	"packages/modules/Bluetooth/system/btif",		"packages/modules/Bluetooth/system/btif",
			"packages/modules/Bluetooth/system/gd",
	"packages/modules/Bluetooth/system/gd/rust/shim",		"packages/modules/Bluetooth/system/gd/rust/shim",
	"packages/modules/Bluetooth/system/stack/include",		"packages/modules/Bluetooth/system/stack/include",
	"packages/modules/Bluetooth/system/bta/include",
	],		],
	cflags: [		cflags: [
	// http://b/264549607		// http://b/264549607