Merge "[BP CLEANUP] Format bpfmt -s conflict 1/2" into tm-qpr-dev-plus-aosp (69aa40a2) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/Android.bp

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1071,8 +1071,8 @@ cc_test {
	"btm/btm_ble_cont_energy.cc",		"btm/btm_ble_cont_energy.cc",
	"btm/btm_ble_gap.cc",		"btm/btm_ble_gap.cc",
	"btm/btm_ble_multi_adv.cc",		"btm/btm_ble_multi_adv.cc",
	"btm/btm_ble_scanner.cc",
	"btm/btm_ble_privacy.cc",		"btm/btm_ble_privacy.cc",
			"btm/btm_ble_scanner.cc",
	"btm/btm_client_interface.cc",		"btm/btm_client_interface.cc",
	"btm/btm_dev.cc",		"btm/btm_dev.cc",
	"btm/btm_devctl.cc",		"btm/btm_devctl.cc",
	@@ -1080,18 +1080,18 @@ cc_test {
	"btm/btm_iot_config.cc",		"btm/btm_iot_config.cc",
	"btm/btm_iso.cc",		"btm/btm_iso.cc",
	"btm/btm_main.cc",		"btm/btm_main.cc",
			"btm/btm_scn.cc",
	"btm/btm_sco.cc",		"btm/btm_sco.cc",
	"btm/btm_sco_hci.cc",		"btm/btm_sco_hci.cc",
	"btm/btm_sco_hfp_hal.cc",		"btm/btm_sco_hfp_hal.cc",
	"btm/btm_scn.cc",
	"btm/btm_sec.cc",		"btm/btm_sec.cc",
	"btm/hfp_msbc_encoder.cc",
	"btm/hfp_msbc_decoder.cc",		"btm/hfp_msbc_decoder.cc",
			"btm/hfp_msbc_encoder.cc",
	"metrics/stack_metrics_logging.cc",		"metrics/stack_metrics_logging.cc",
			"test/btm/peer_packet_types_test.cc",
	"test/btm/sco_hci_test.cc",		"test/btm/sco_hci_test.cc",
	"test/btm/stack_btm_test.cc",
	"test/btm/stack_btm_regression_tests.cc",		"test/btm/stack_btm_regression_tests.cc",
	"test/btm/peer_packet_types_test.cc",		"test/btm/stack_btm_test.cc",
	"test/common/mock_eatt.cc",		"test/common/mock_eatt.cc",
	],		],
	static_libs: [		static_libs: [