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

Commit 3189c62e authored by Myles Watson's avatar Myles Watson
Browse files

HCI: Start facade directory for testing 

Create new tests that depend on the HciLayer.  Other interfaces
deserve their own facades.

Bug: 143568835
Test: ./cert/run_cert_facade_only.sh
Change-Id: Ia6bf16a42450a457c5d7ea3430a6d300f113a2b8
parent 23604ea8

system/gd/Android.bp

+7 −8
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ filegroup { 
        "facade/common.proto",

        "facade/rootservice.proto",

        "hal/facade.proto",

        "hci/facade.proto",

        "hci/facade/facade.proto",

        "hci/facade/le_advertising_manager_facade.proto",

        "l2cap/classic/facade.proto",

        "security/facade.proto",
@@ -421,8 +421,8 @@ genrule { 
        "facade/rootservice.pb.h",

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

        "hal/facade.pb.h",

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

        "hci/facade.pb.h",

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

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

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

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

        "l2cap/classic/facade.grpc.pb.h",
@@ -449,8 +449,8 @@ genrule { 
        "facade/rootservice.pb.cc",

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

        "hal/facade.pb.cc",

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

        "hci/facade.pb.cc",

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

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

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

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

        "l2cap/classic/facade.grpc.pb.cc",
@@ -490,10 +490,9 @@ genrule { 
        "hal/__init__.py",

        "hal/facade_pb2_grpc.py",

        "hal/facade_pb2.py",

        "hci/__init__.py",

        "hci/facade_pb2_grpc.py",

        "hci/facade_pb2.py",

        "hci/facade/__init__.py",

        "hci/facade/facade_pb2_grpc.py",

        "hci/facade/facade_pb2.py",

        "hci/facade/le_advertising_manager_facade_pb2_grpc.py",

        "hci/facade/le_advertising_manager_facade_pb2.py",

        "l2cap/classic/__init__.py",

system/gd/cert/cert_testcases_facade_only

+2 −0
Original line number Diff line number Diff line 
CertSelfTest

SimpleHalTest

DirectHciTest

LeAdvertisingManagerTest

SimpleSecurityTest

system/gd/cert/gd_device.py

+5 −4
Original line number Diff line number Diff line
@@ -14,10 +14,12 @@ 
#   See the License for the specific language governing permissions and

#   limitations under the License.



import logging



from facade import rootservice_pb2_grpc as facade_rootservice_pb2_grpc

from gd_device_base import GdDeviceBase, GdDeviceConfigError, replace_vars

from hal import facade_pb2_grpc as hal_facade_pb2_grpc

from hci import facade_pb2_grpc as hci_facade_pb2_grpc

from hci.facade import facade_pb2_grpc as hci_facade_pb2_grpc

from hci.facade import le_advertising_manager_facade_pb2_grpc

from l2cap.classic import facade_pb2_grpc as l2cap_facade_pb2_grpc

from security import facade_pb2_grpc as security_facade_pb2_grpc
@@ -52,6 +54,7 @@ def get_instances_with_configs(configs): 
    for config in configs:

        resolved_cmd = []

        for entry in config["cmd"]:

            logging.debug(entry)

            resolved_cmd.append(replace_vars(entry, config))

        devices.append(

            GdDevice(config["grpc_port"], config["grpc_root_server_port"],
@@ -72,9 +75,7 @@ class GdDevice(GdDeviceBase): 
        self.hal = hal_facade_pb2_grpc.HciHalFacadeStub(self.grpc_channel)

        self.controller_read_only_property = facade_rootservice_pb2_grpc.ReadOnlyPropertyStub(

            self.grpc_channel)

        self.hci = hci_facade_pb2_grpc.AclManagerFacadeStub(self.grpc_channel)

        self.hci_classic_security = hci_facade_pb2_grpc.ClassicSecurityManagerFacadeStub(

            self.grpc_channel)

        self.hci = hci_facade_pb2_grpc.HciLayerFacadeStub(self.grpc_channel)

        self.l2cap = l2cap_facade_pb2_grpc.L2capClassicModuleFacadeStub(

            self.grpc_channel)

        self.hci_le_advertising_manager = le_advertising_manager_facade_pb2_grpc.LeAdvertisingManagerFacadeStub(

system/gd/facade/grpc_root_server.cc

+4 −3
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
#include "facade/rootservice.grpc.pb.h"

#include "grpc/grpc_module.h"

#include "hal/facade.h"

#include "hci/facade.h"

#include "hci/facade/facade.h"

#include "hci/facade/le_advertising_manager_facade.h"

#include "l2cap/classic/facade.h"

#include "os/log.h"

#include "os/thread.h"
@@ -56,8 +57,8 @@ class RootFacadeService : public ::bluetooth::facade::RootFacade::Service { 
        break;

      case BluetoothModule::HCI:

        modules.add<::bluetooth::facade::ReadOnlyPropertyServerModule>();

        modules.add<::bluetooth::hci::AclManagerFacadeModule>();

        modules.add<::bluetooth::hci::ClassicSecurityManagerFacadeModule>();

        modules.add<::bluetooth::hci::facade::HciLayerFacadeModule>();

        modules.add<::bluetooth::hci::facade::LeAdvertisingManagerFacadeModule>();

        break;

      case BluetoothModule::L2CAP:

        modules.add<::bluetooth::facade::ReadOnlyPropertyServerModule>();

system/gd/hci/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ filegroup { 
filegroup {

    name: "BluetoothFacade_hci_layer",

    srcs: [

        "facade.cc",

        "facade/facade.cc",

        "facade/le_advertising_manager_facade.cc"

    ],

}