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

Commit a18ccf9b authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Split L2CAP Classic and LE stacks into separate modules am: 28ee68c0 am: 18aa0de9 

am: 00d5febe

Change-Id: I6f08f1dbfe11a20dc7179faa5ef79440fdc42561
parents 2c35785e 00d5febe

system/gd/Android.bp

+18 −18
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ filegroup { 
        "facade/rootservice.proto",

        "hal/facade.proto",

        "hci/facade.proto",

        "l2cap/facade.proto",

        "l2cap/classic/facade.proto",

    ],

}
@@ -349,8 +349,8 @@ genrule { 
        "hal/facade.pb.h",

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

        "hci/facade.pb.h",

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

        "l2cap/facade.pb.h",

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

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

    ],

}
@@ -373,8 +373,8 @@ genrule { 
        "hal/facade.pb.cc",

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

        "hci/facade.pb.cc",

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

        "l2cap/facade.pb.cc",

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

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

    ],

}
@@ -390,8 +390,8 @@ genrule { 
        "touch $(genDir)/hal/cert/__init__.py; " +

        "touch $(genDir)/hci/__init__.py; " +

        "touch $(genDir)/hci/cert/__init__.py; " +

        "touch $(genDir)/l2cap/__init__.py; " +

        "touch $(genDir)/l2cap/cert/__init__.py; ",

        "touch $(genDir)/l2cap/classic/__init__.py; " +

        "touch $(genDir)/l2cap/classic/cert/__init__.py; ",

    srcs: [

        ":BluetoothFacadeProto",

        ":BluetoothCertStackProto",
@@ -410,18 +410,18 @@ genrule { 
        "hci/__init__.py",

        "hci/facade_pb2_grpc.py",

        "hci/facade_pb2.py",

        "l2cap/__init__.py",

        "l2cap/facade_pb2_grpc.py",

        "l2cap/facade_pb2.py",

        "l2cap/classic/__init__.py",

        "l2cap/classic/facade_pb2_grpc.py",

        "l2cap/classic/facade_pb2.py",

        "hal/cert/__init__.py",

        "hal/cert/api_pb2_grpc.py",

        "hal/cert/api_pb2.py",

        "hci/cert/__init__.py",

        "hci/cert/api_pb2_grpc.py",

        "hci/cert/api_pb2.py",

        "l2cap/cert/__init__.py",

        "l2cap/cert/api_pb2_grpc.py",

        "l2cap/cert/api_pb2.py",

        "l2cap/classic/cert/__init__.py",

        "l2cap/classic/cert/api_pb2_grpc.py",

        "l2cap/classic/cert/api_pb2.py",

    ],

}
@@ -431,7 +431,7 @@ filegroup { 
        "cert/rootservice.proto",

        "hal/cert/api.proto",

        "hci/cert/api.proto",

        "l2cap/cert/api.proto",

        "l2cap/classic/cert/api.proto",

    ],

}
@@ -455,8 +455,8 @@ genrule { 
        "hal/cert/api.pb.h",

        "hci/cert/api.grpc.pb.h",

        "hci/cert/api.pb.h",

        "l2cap/cert/api.grpc.pb.h",

        "l2cap/cert/api.pb.h",

        "l2cap/classic/cert/api.grpc.pb.h",

        "l2cap/classic/cert/api.pb.h",

    ],

}
@@ -480,7 +480,7 @@ genrule { 
        "hal/cert/api.pb.cc",

        "hci/cert/api.grpc.pb.cc",

        "hci/cert/api.pb.cc",

        "l2cap/cert/api.grpc.pb.cc",

        "l2cap/cert/api.pb.cc",

        "l2cap/classic/cert/api.grpc.pb.cc",

        "l2cap/classic/cert/api.pb.cc",

    ],

}

system/gd/cert/gd_cert_device.py

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ from cert.event_stream import EventStream 
from cert import rootservice_pb2_grpc as cert_rootservice_pb2_grpc

from hal.cert import api_pb2_grpc as hal_cert_pb2_grpc

from hci.cert import api_pb2_grpc as hci_cert_pb2_grpc

from l2cap.cert import api_pb2_grpc as l2cap_cert_pb2_grpc

from l2cap.classic.cert import api_pb2_grpc as l2cap_cert_pb2_grpc



ACTS_CONTROLLER_CONFIG_NAME = "GdCertDevice"

ACTS_CONTROLLER_REFERENCE_NAME = "gd_cert_devices"

system/gd/cert/gd_device.py

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ from cert.event_stream import EventStream 
from facade import rootservice_pb2_grpc as facade_rootservice_pb2_grpc

from hal import facade_pb2_grpc as hal_facade_pb2_grpc

from hci import facade_pb2_grpc as hci_facade_pb2_grpc

from l2cap import facade_pb2_grpc as l2cap_facade_pb2_grpc

from l2cap.classic import facade_pb2_grpc as l2cap_facade_pb2_grpc



ACTS_CONTROLLER_CONFIG_NAME = "GdDevice"

ACTS_CONTROLLER_REFERENCE_NAME = "gd_devices"

system/gd/cert/grpc_root_server.cc

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "grpc/grpc_module.h"

#include "hal/cert/cert.h"

#include "hci/cert/cert.h"

#include "l2cap/cert/cert.h"

#include "l2cap/classic/cert/cert.h"

#include "os/log.h"

#include "os/thread.h"

#include "stack_manager.h"
@@ -59,7 +59,7 @@ class RootCertService : public ::bluetooth::cert::RootCert::Service { 
        break;

      case BluetoothModule::L2CAP:

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

        modules.add<::bluetooth::l2cap::cert::L2capModuleCertModule>();

        modules.add<::bluetooth::l2cap::classic::cert::L2capModuleCertModule>();

        break;

      default:

        return ::grpc::Status(::grpc::StatusCode::INVALID_ARGUMENT, "invalid module under test");

system/gd/facade/grpc_root_server.cc

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "grpc/grpc_module.h"

#include "hal/facade.h"

#include "hci/facade.h"

#include "l2cap/facade.h"

#include "l2cap/classic/facade.h"

#include "os/log.h"

#include "os/thread.h"

#include "stack_manager.h"
@@ -60,7 +60,7 @@ class RootFacadeService : public ::bluetooth::facade::RootFacade::Service { 
        break;

      case BluetoothModule::L2CAP:

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

        modules.add<::bluetooth::l2cap::L2capModuleFacadeModule>();

        modules.add<::bluetooth::l2cap::classic::L2capModuleFacadeModule>();

        break;

      default:

        return ::grpc::Status(::grpc::StatusCode::INVALID_ARGUMENT, "invalid module under test");