Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0df9e186 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge changes I5dc837c7,I0cf32fa7,I1a65e35f into main 

* changes:
  Remove blueberry facade proto definitions
  Remove the rust_binary bt_topshim_facade
  Remove the cc_binary bluetooth_stack_with_facade
parents e97e59c7 e9e92661

system/Android.bp

+0 −110
Original line number Diff line number Diff line
@@ -10,26 +10,6 @@ package { 
    default_applicable_licenses: ["system_bt_license"],

}



filegroup {

    name: "BlueberryFacadeProto",

    srcs: [

        "blueberry/facade/common.proto",

        "blueberry/facade/hal/hal_facade.proto",

        "blueberry/facade/hci/acl_manager_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_advertising_manager_facade.proto",

        "blueberry/facade/hci/le_initiator_address_facade.proto",

        "blueberry/facade/hci/le_scanning_manager_facade.proto",

        "blueberry/facade/l2cap/classic/facade.proto",

        "blueberry/facade/l2cap/le/facade.proto",

        "blueberry/facade/neighbor/facade.proto",

        "blueberry/facade/rootservice.proto",

        "blueberry/facade/topshim/facade.proto",

    ],

}



filegroup {

    name: "TestMockCodecManager",

    srcs: [
@@ -37,96 +17,6 @@ filegroup { 
    ],

}



genrule {

    name: "BlueberryFacadeGeneratedStub_h",

    tools: [

        "aprotoc",

        "protoc-gen-grpc-cpp-plugin",

    ],

    cmd: "$(location aprotoc) -Ipackages/modules/Bluetooth/system -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(locations :BlueberryFacadeProto) --grpc_out=$(genDir) --cpp_out=$(genDir)",

    srcs: [

        ":BlueberryFacadeProto",

        ":libprotobuf-internal-protos",

    ],

    out: [

        "blueberry/facade/common.grpc.pb.h",

        "blueberry/facade/common.pb.h",

        "blueberry/facade/hal/hal_facade.grpc.pb.h",

        "blueberry/facade/hal/hal_facade.pb.h",

        "blueberry/facade/hci/acl_manager_facade.grpc.pb.h",

        "blueberry/facade/hci/acl_manager_facade.pb.h",

        "blueberry/facade/hci/controller_facade.grpc.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.pb.h",

        "blueberry/facade/hci/le_advertising_manager_facade.grpc.pb.h",

        "blueberry/facade/hci/le_advertising_manager_facade.pb.h",

        "blueberry/facade/hci/le_initiator_address_facade.grpc.pb.h",

        "blueberry/facade/hci/le_initiator_address_facade.pb.h",

        "blueberry/facade/hci/le_scanning_manager_facade.grpc.pb.h",

        "blueberry/facade/hci/le_scanning_manager_facade.pb.h",

        "blueberry/facade/l2cap/classic/facade.grpc.pb.h",

        "blueberry/facade/l2cap/classic/facade.pb.h",

        "blueberry/facade/l2cap/le/facade.grpc.pb.h",

        "blueberry/facade/l2cap/le/facade.pb.h",

        "blueberry/facade/neighbor/facade.grpc.pb.h",

        "blueberry/facade/neighbor/facade.pb.h",

        "blueberry/facade/rootservice.grpc.pb.h",

        "blueberry/facade/rootservice.pb.h",

    ],

}



genrule {

    name: "BlueberryFacadeGeneratedStub_cc",

    tools: [

        "aprotoc",

        "protoc-gen-grpc-cpp-plugin",

    ],

    cmd: "$(location aprotoc) -Ipackages/modules/Bluetooth/system -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(locations :BlueberryFacadeProto) --grpc_out=$(genDir) --cpp_out=$(genDir)",

    srcs: [

        ":BlueberryFacadeProto",

        ":libprotobuf-internal-protos",

    ],

    out: [

        "blueberry/facade/common.grpc.pb.cc",

        "blueberry/facade/common.pb.cc",

        "blueberry/facade/hal/hal_facade.grpc.pb.cc",

        "blueberry/facade/hal/hal_facade.pb.cc",

        "blueberry/facade/hci/acl_manager_facade.grpc.pb.cc",

        "blueberry/facade/hci/acl_manager_facade.pb.cc",

        "blueberry/facade/hci/controller_facade.grpc.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.pb.cc",

        "blueberry/facade/hci/le_advertising_manager_facade.grpc.pb.cc",

        "blueberry/facade/hci/le_advertising_manager_facade.pb.cc",

        "blueberry/facade/hci/le_initiator_address_facade.grpc.pb.cc",

        "blueberry/facade/hci/le_initiator_address_facade.pb.cc",

        "blueberry/facade/hci/le_scanning_manager_facade.grpc.pb.cc",

        "blueberry/facade/hci/le_scanning_manager_facade.pb.cc",

        "blueberry/facade/l2cap/classic/facade.grpc.pb.cc",

        "blueberry/facade/l2cap/classic/facade.pb.cc",

        "blueberry/facade/l2cap/le/facade.grpc.pb.cc",

        "blueberry/facade/l2cap/le/facade.pb.cc",

        "blueberry/facade/neighbor/facade.grpc.pb.cc",

        "blueberry/facade/neighbor/facade.pb.cc",

        "blueberry/facade/rootservice.grpc.pb.cc",

        "blueberry/facade/rootservice.pb.cc",

    ],

}



rust_protobuf {

    name: "libbt_topshim_facade_protobuf",

    crate_name: "bt_topshim_facade_protobuf",

    source_stem: "topshim_facade",

    host_supported: true,

    grpc_protos: ["blueberry/facade/topshim/facade.proto"],

}



// Export system headers for rules that can't simply use `include_dirs`

cc_library_headers {

    name: "libbluetooth_system_headers",

system/blueberry/facade/common.proto

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
syntax = "proto3";



package blueberry.facade;



message Data {

  bytes payload = 1;

}



message BluetoothAddress {

  bytes address = 1;

}



enum BluetoothAddressTypeEnum {

  PUBLIC_DEVICE_ADDRESS = 0x0;

  RANDOM_DEVICE_ADDRESS = 0x1;

  PUBLIC_IDENTITY_ADDRESS = 0x2;

  RANDOM_IDENTITY_ADDRESS = 0x3;

}



enum BluetoothOwnAddressTypeEnum {

  USE_PUBLIC_DEVICE_ADDRESS = 0x0;

  USE_RANDOM_DEVICE_ADDRESS = 0x1;

  RESOLVABLE_OR_PUBLIC_ADDRESS = 0x2;

  RESOLVABLE_OR_RANDOM_ADDRESS = 0x3;

}



message BluetoothAddressWithType {

  BluetoothAddress address = 1;

  BluetoothAddressTypeEnum type = 2;

}



enum BluetoothPeerAddressTypeEnum {

  PUBLIC_DEVICE_OR_IDENTITY_ADDRESS = 0x0;

  RANDOM_DEVICE_OR_IDENTITY_ADDRESS = 0x1;

}

system/blueberry/facade/hal/hal_facade.proto

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
syntax = "proto3";



package blueberry.facade.hal;



import "google/protobuf/empty.proto";

import "blueberry/facade/common.proto";



service HciHalFacade {

  rpc SendCommand(blueberry.facade.Data) returns (google.protobuf.Empty) {}

  rpc StreamEvents(google.protobuf.Empty) returns (stream blueberry.facade.Data) {}



  rpc SendAcl(blueberry.facade.Data) returns (google.protobuf.Empty) {}

  rpc StreamAcl(google.protobuf.Empty) returns (stream blueberry.facade.Data) {}



  rpc SendSco(blueberry.facade.Data) returns (google.protobuf.Empty) {}

  rpc StreamSco(google.protobuf.Empty) returns (stream blueberry.facade.Data) {}



  rpc SendIso(blueberry.facade.Data) returns (google.protobuf.Empty) {}

  rpc StreamIso(google.protobuf.Empty) returns (stream blueberry.facade.Data) {}

}

system/blueberry/facade/hci/acl_manager_facade.proto

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
syntax = "proto3";



package blueberry.facade.hci;



import "google/protobuf/empty.proto";



service AclManagerFacade {

  rpc CreateConnection(ConnectionMsg) returns (stream ConnectionEvent) {}

  rpc CancelConnection(ConnectionMsg) returns (google.protobuf.Empty) {}

  rpc Disconnect(HandleMsg) returns (google.protobuf.Empty) {}

  rpc WriteDefaultLinkPolicySettings(PolicyMsg) returns (google.protobuf.Empty) {}

  rpc AuthenticationRequested(HandleMsg) returns (google.protobuf.Empty) {}

  rpc ConnectionCommand(ConnectionCommandMsg) returns (google.protobuf.Empty) {}

  rpc SwitchRole(RoleMsg) returns (google.protobuf.Empty) {}

  rpc SendAclData(AclData) returns (google.protobuf.Empty) {}

  rpc FetchAclData(HandleMsg) returns (stream AclData) {}

  rpc FetchIncomingConnection(google.protobuf.Empty) returns (stream ConnectionEvent) {}

}



message HandleMsg {

  uint32 handle = 1;

}



message ConnectionMsg {

  bytes address = 1;

}



message PolicyMsg {

  uint32 policy = 1;

}



enum NewRole {

  CENTRAL = 0;

  PERIPHERAL = 1;

}



message RoleMsg {

  bytes address = 1;

  NewRole role = 2;

}



message ConnectionCommandMsg {

  bytes packet = 1;

}



message ConnectionEvent {

  bytes payload = 1;

}



message AclData {

  uint32 handle = 1;

  bytes payload = 2;

}

system/blueberry/facade/hci/controller_facade.proto

deleted100644 → 0
+0 −96
Original line number Diff line number Diff line 
syntax = "proto3";



package blueberry.facade.hci;



import "google/protobuf/empty.proto";

import "blueberry/facade/common.proto";



service ControllerFacade {

  rpc GetMacAddress(google.protobuf.Empty) returns (blueberry.facade.BluetoothAddress) {}

  rpc WriteLocalName(NameMsg) returns (google.protobuf.Empty) {}

  rpc GetLocalName(google.protobuf.Empty) returns (NameMsg) {}

  rpc IsSupportedCommand(OpCodeMsg) returns (SupportedMsg) {}

  rpc GetLeNumberOfSupportedAdvertisingSets(google.protobuf.Empty) returns (SingleValueMsg) {}

  rpc SupportsSimplePairing(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsSecureConnections(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsSimultaneousLeBrEdr(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsInterlacedInquiryScan(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsRssiWithInquiryResults(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsExtendedInquiryResponse(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsRoleSwitch(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc Supports3SlotPackets(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc Supports5SlotPackets(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsClassic2mPhy(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsClassic3mPhy(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc Supports3SlotEdrPackets(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc Supports5SlotEdrPackets(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsSco(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsHv2Packets(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsHv3Packets(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsEv3Packets(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsEv4Packets(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsEv5Packets(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsEsco2mPhy(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsEsco3mPhy(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc Supports3SlotEscoEdrPackets(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsHoldMode(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsSniffMode(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsParkMode(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsNonFlushablePb(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsSniffSubrating(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsEncryptionPause(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBle(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleEncryption(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleConnectionParametersRequest(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleExtendedReject(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBlePeripheralInitiatedFeaturesExchange(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBlePing(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleDataPacketLengthExtension(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBlePrivacy(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleExtendedScannerFilterPolicies(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBle2mPhy(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleStableModulationIndexTx(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleStableModulationIndexRx(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleCodedPhy(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleExtendedAdvertising(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBlePeriodicAdvertising(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleChannelSelectionAlgorithm2(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBlePowerClass1(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleMinimumUsedChannels(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleConnectionCteRequest(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleConnectionCteResponse(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleConnectionlessCteTransmitter(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleConnectionlessCteReceiver(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleAntennaSwitchingDuringCteTx(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleAntennaSwitchingDuringCteRx(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleReceivingConstantToneExtensions(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBlePeriodicAdvertisingSyncTransferSender(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBlePeriodicAdvertisingSyncTransferRecipient(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleSleepClockAccuracyUpdates(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleRemotePublicKeyValidation(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleConnectedIsochronousStreamCentral(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleConnectedIsochronousStreamPeripheral(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleIsochronousBroadcaster(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleSynchronizedReceiver(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBleIsochronousChannelsHostSupport(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBlePowerControlRequest(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBlePowerChangeIndication(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBlePathLossMonitoring(google.protobuf.Empty) returns (SupportedMsg) {}

  rpc SupportsBlePeriodicAdvertisingAdi(google.protobuf.Empty) returns (SupportedMsg) {}

}



message NameMsg {

  bytes name = 1;

}



message OpCodeMsg {

  uint32 op_code = 1;

}



message SupportedMsg {

  bool supported = 1;

}



message SingleValueMsg {

  uint64 value = 1;

}
 
 No newline at end of file