Merge "poof!" into main (6a02fcf4) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/Android.bp

+0 −10

Original line number	Diff line number	Diff line
		@@ -143,12 +143,10 @@ cc_defaults {
		":BluetoothDumpsysSources",
		":BluetoothHalSources",
		":BluetoothHciSources",
		":BluetoothL2capSources",
		":BluetoothMetricsSources",
		":BluetoothNeighborSources",
		":BluetoothOsSources",
		":BluetoothPacketSources",
		":BluetoothSecuritySources",
		":BluetoothStorageSources",
		"module.cc",
		"module_dumper.cc",
		@@ -298,7 +296,6 @@ cc_binary {
		srcs: [
		":BluetoothFacade_hci_hal",
		":BluetoothFacade_hci_layer",
		":BluetoothFacade_l2cap_layer",
		":BluetoothFacade_neighbor",
		":TestMockMainShimStack",
		"facade/facade_main.cc",
		@@ -476,11 +473,9 @@ cc_test {
		":BluetoothCryptoToolboxTestSources",
		":BluetoothHalTestSources",
		":BluetoothHciUnitTestSources",
		":BluetoothL2capUnitTestSources",
		":BluetoothMetricsTestSources",
		":BluetoothOsTestSources",
		":BluetoothPacketTestSources",
		":BluetoothSecurityUnitTestSources",
		":BluetoothStorageUnitTestSources",
		"module_unittest.cc",
		"stack_manager_unittest.cc",
		@@ -699,7 +694,6 @@ cc_fuzz {
		defaults: ["gd_fuzz_defaults"],
		srcs: [
		":BluetoothHciFuzzTestSources",
		":BluetoothL2capFuzzTestSources",
		"fuzz_test.cc",
		],
		fuzz_config: {
		@@ -767,7 +761,6 @@ genrule {
		"dumpsys_data.fbs",
		"hci/hci_acl_manager.fbs",
		"hci/hci_controller.fbs",
		"l2cap/classic/l2cap_classic_module.fbs",
		"module_unittest.fbs",
		"os/wakelock_manager.fbs",
		"shim/dumpsys.fbs",
		@@ -778,7 +771,6 @@ genrule {
		"hci_acl_manager.bfbs",
		"hci_controller.bfbs",
		"init_flags.bfbs",
		"l2cap_classic_module.bfbs",
		"wakelock_manager.bfbs",
		],
		}
		@@ -794,7 +786,6 @@ genrule {
		"dumpsys_data.fbs",
		"hci/hci_acl_manager.fbs",
		"hci/hci_controller.fbs",
		"l2cap/classic/l2cap_classic_module.fbs",
		"module_unittest.fbs",
		"os/wakelock_manager.fbs",
		"shim/dumpsys.fbs",
		@@ -805,7 +796,6 @@ genrule {
		"hci_acl_manager_generated.h",
		"hci_controller_generated.h",
		"init_flags_generated.h",
		"l2cap_classic_module_generated.h",
		"wakelock_manager_generated.h",
		],
		}

system/gd/BUILD.gn

+0 −4

Original line number	Diff line number	Diff line
		@@ -83,10 +83,8 @@ static_library("libbluetooth_gd") {
		"//bt/system/gd/hal:BluetoothHalSources",
		"//bt/system/gd/hal:BluetoothHalSources_hci_host",
		"//bt/system/gd/hal:BluetoothHalSources_ranging_host",
		"//bt/system/gd/l2cap:BluetoothL2capSources",
		"//bt/system/gd/metrics:BluetoothMetricsSources",
		"//bt/system/gd/neighbor:BluetoothNeighborSources",
		"//bt/system/gd/security:BluetoothSecuritySources",
		"//bt/system/gd/shim:BluetoothShimSources",
		"//bt/system/gd/storage:BluetoothStorageSources",
		"//bt/system/gd/sysprops:BluetoothSyspropsSources",
		@@ -100,7 +98,6 @@ flatbuffer("BluetoothGeneratedDumpsysDataSchema_h") {
		"dumpsys_data.fbs",
		"hci/hci_acl_manager.fbs",
		"hci/hci_controller.fbs",
		"l2cap/classic/l2cap_classic_module.fbs",
		"os/wakelock_manager.fbs",
		"shim/dumpsys.fbs",
		]
		@@ -112,7 +109,6 @@ bt_flatc_binary_schema("BluetoothGeneratedDumpsysBinarySchema_bfbs") {
		"dumpsys_data.fbs",
		"hci/hci_acl_manager.fbs",
		"hci/hci_controller.fbs",
		"l2cap/classic/l2cap_classic_module.fbs",
		"os/wakelock_manager.fbs",
		"shim/dumpsys.fbs",
		]

system/gd/dumpsys_data.fbs

+0 −2

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@
		include "common/init_flags.fbs";
		include "hci/hci_acl_manager.fbs";
		include "hci/hci_controller.fbs";
		include "l2cap/classic/l2cap_classic_module.fbs";
		include "module_unittest.fbs";
		include "os/wakelock_manager.fbs";
		include "shim/dumpsys.fbs";
		@@ -26,7 +25,6 @@ table DumpsysData {
		init_flags:common.InitFlagsData (privacy:"Any");
		wakelock_manager_data:bluetooth.os.WakelockManagerData (privacy:"Any");
		shim_dumpsys_data:bluetooth.shim.DumpsysModuleData (privacy:"Any");
		l2cap_classic_dumpsys_data:bluetooth.l2cap.classic.L2capClassicModuleData (privacy:"Any");
		hci_acl_manager_dumpsys_data:bluetooth.hci.AclManagerData (privacy:"Any");
		hci_controller_dumpsys_data:bluetooth.hci.ControllerData (privacy:"Any");
		module_unittest_data:bluetooth.ModuleUnitTestData; // private

system/gd/facade/grpc_root_server.cc

+0 −22

Original line number	Diff line number	Diff line
		@@ -29,8 +29,6 @@
		#include "hci/facade/le_advertising_manager_facade.h"
		#include "hci/facade/le_initiator_address_facade.h"
		#include "hci/facade/le_scanning_manager_facade.h"
		#include "l2cap/classic/facade.h"
		#include "l2cap/le/facade.h"
		#include "neighbor/facade/facade.h"
		#include "os/log.h"
		#include "os/thread.h"
		@@ -77,26 +75,6 @@ public:
		modules.add<::bluetooth::hci::facade::LeScanningManagerFacadeModule>();
		modules.add<::bluetooth::neighbor::facade::NeighborFacadeModule>();
		break;
		case BluetoothModule::L2CAP:
		modules.add<::bluetooth::hci::facade::ControllerFacadeModule>();
		modules.add<::bluetooth::hci::facade::LeAdvertisingManagerFacadeModule>();
		modules.add<::bluetooth::hci::facade::LeInitiatorAddressFacadeModule>();
		modules.add<::bluetooth::neighbor::facade::NeighborFacadeModule>();
		modules.add<::bluetooth::facade::ReadOnlyPropertyServerModule>();
		modules.add<::bluetooth::l2cap::classic::L2capClassicModuleFacadeModule>();
		modules.add<::bluetooth::l2cap::le::L2capLeModuleFacadeModule>();
		modules.add<::bluetooth::hci::facade::HciFacadeModule>();
		break;
		case BluetoothModule::SECURITY:
		modules.add<::bluetooth::facade::ReadOnlyPropertyServerModule>();
		modules.add<::bluetooth::hci::facade::ControllerFacadeModule>();
		modules.add<::bluetooth::neighbor::facade::NeighborFacadeModule>();
		modules.add<::bluetooth::l2cap::classic::L2capClassicModuleFacadeModule>();
		modules.add<::bluetooth::hci::facade::HciFacadeModule>();
		modules.add<::bluetooth::hci::facade::ControllerFacadeModule>();
		modules.add<::bluetooth::hci::facade::LeAdvertisingManagerFacadeModule>();
		modules.add<::bluetooth::hci::facade::LeScanningManagerFacadeModule>();
		break;
		default:
		return ::grpc::Status(::grpc::StatusCode::INVALID_ARGUMENT, "invalid module under test");
		}

system/gd/fuzz_test.cc

+0 −4

Original line number	Diff line number	Diff line
		@@ -17,13 +17,9 @@
		#include <stddef.h>
		#include <stdint.h>

		void RunL2capClassicDynamicChannelAllocatorFuzzTest(const uint8_t* data, size_t size);
		void RunL2capPacketFuzzTest(const uint8_t* data, size_t size);
		void RunHciPacketFuzzTest(const uint8_t* data, size_t size);

		extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
		RunL2capClassicDynamicChannelAllocatorFuzzTest(data, size);
		RunL2capPacketFuzzTest(data, size);
		RunHciPacketFuzzTest(data, size);
		return 0;
		}