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

Commit 0e2a9c20 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5845878 from 3781c978 to rvc-release 

Change-Id: I90e52cd695dd31f5eabd475741f7220cf9bc27a8
parents 7ffaf56d 3781c978

system/gd/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ cc_binary { 
    srcs: [

        "facade/facade_main.cc",

        "facade/grpc_root_server.cc",

        "facade/read_only_property_server.cc",

        "grpc/grpc_module.cc",

        ":BluetoothFacade_hci_hal",

        ":BluetoothFacade_hci_layer",
@@ -176,6 +177,7 @@ cc_binary { 
    srcs: [

        "cert/cert_main.cc",

        "cert/grpc_root_server.cc",

        "cert/read_only_property_server.cc",

        "grpc/grpc_module.cc",

        ":BluetoothCertSource_hci_hal",

        ":BluetoothCertSource_hci_layer",

system/gd/cert/android_devices_config.json

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
                        "/system/bin/stack_with_facade",

                        "--grpc-port=$(grpc_port)",

                        "--root-server-port=$(grpc_root_server_port)",

                        "--btsnoop=data/misc/bluetooth/logs/btsnoop_hci.log"

                    ]

                }

            ],
@@ -39,6 +40,7 @@ 
                        "/system/bin/bluetooth_cert_stack",

                        "--grpc-port=$(grpc_port)",

                        "--root-server-port=$(grpc_root_server_port)",

                        "--btsnoop=data/misc/bluetooth/logs/btsnoop_hci.log"

                    ]

                }

            ]

system/gd/cert/gd_cert_device.py

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ class GdCertDevice(GdDeviceBase): 
        # Cert stubs

        self.rootservice = cert_rootservice_pb2_grpc.RootCertStub(self.grpc_root_server_channel)

        self.hal = hal_cert_pb2_grpc.HciHalCertStub(self.grpc_channel)

        self.controller_read_only_property = cert_rootservice_pb2_grpc.ReadOnlyPropertyStub(self.grpc_channel)

        self.hci = hci_cert_pb2_grpc.AclManagerCertStub(self.grpc_channel)

        self.l2cap = l2cap_cert_pb2_grpc.L2capModuleCertStub(self.grpc_channel)

system/gd/cert/gd_device.py

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ class GdDevice(GdDeviceBase): 
        # Facade stubs

        self.rootservice = facade_rootservice_pb2_grpc.RootFacadeStub(self.grpc_root_server_channel)

        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.l2cap = l2cap_facade_pb2_grpc.L2capModuleFacadeStub(self.grpc_channel)

system/gd/cert/gd_device_base.py

+5 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
import logging

import os

from builtins import open

import json

import signal

import socket

import subprocess
@@ -60,6 +61,8 @@ class GdDeviceBase: 
            log_path_base, '%s_%s_backing_logs.txt' % (type_identifier, label))

        self.backing_process_logs = open(backing_process_logpath, 'w')



        cmd_str = json.dumps(cmd)

        if "--btsnoop=" not in cmd_str:

            btsnoop_path = os.path.join(log_path_base, '%s_btsnoop_hci.log' % label)

            cmd.append("--btsnoop=" + btsnoop_path)