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

Commit 3eade2a8 authored by Myles Watson's avatar Myles Watson
Browse files

HciInterface: Allow legacy tests to use fake HCI 

Bug: 322230000
Test: mma -j32
Flag: TEST_ONLY
Change-Id: I122c2d471324d10706fa890c4de62c0fc0d91f2d
parent 424fd512

system/gd/hci/Android.bp

+8 −1
Original line number Diff line number Diff line
@@ -31,10 +31,18 @@ filegroup { 
    ],

}



filegroup {

    name: "BluetoothHciFake",

    srcs: [

        "hci_layer_fake.cc",

    ],

}



filegroup {

    name: "BluetoothHciUnitTestSources",

    srcs: [

        ":BluetoothHalFake",

        ":BluetoothHciFake",

        "acl_builder_test.cc",

        "acl_manager/acl_scheduler_test.cc",

        "acl_manager/classic_acl_connection_test.cc",
@@ -49,7 +57,6 @@ filegroup { 
        "class_of_device_unittest.cc",

        "controller_test.cc",

        "controller_unittest.cc",

        "hci_layer_fake.cc",

        "hci_layer_test.cc",

        "hci_layer_unittest.cc",

        "hci_packets_test.cc",

system/gd/hci/hci_layer_fake.cc

+2 −1
Original line number Diff line number Diff line
@@ -20,9 +20,10 @@ 
#include <gmock/gmock.h>

#include <gtest/gtest.h>



#include <algorithm>

#include <chrono>



#include "packet/raw_builder.h"



namespace bluetooth {

namespace hci {

system/gd/hci/hci_layer_fake.h

+3 −3
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 
 */



#include <future>

#include <list>

#include <map>

#include <memory>

#include <queue>

#include <vector>



#include "common/bind.h"

#include "hci/address.h"

#include "hci/hci_layer.h"

#include "packet/raw_builder.h"



namespace bluetooth {

namespace hci {

system/test/mock/mock_main_shim_entry.cc

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include "hci/controller_interface_mock.h"

#include "hci/distance_measurement_manager_mock.h"

#include "hci/hci_interface.h"

#include "hci/hci_layer_mock.h"

#include "hci/le_advertising_manager_mock.h"

#include "hci/le_scanning_manager_mock.h"

#include "main/shim/entry.h"
@@ -32,7 +31,7 @@ namespace testing { 
MockAclManager* mock_acl_manager_{nullptr};

MockControllerInterface* mock_controller_{nullptr};

shim::Dumpsys* shim_dumpsys_ = {};

MockHciLayer* mock_hci_layer_{nullptr};

HciInterface* mock_hci_layer_{nullptr};

os::Handler* mock_gd_shim_handler_{nullptr};

MockLeAdvertisingManager* mock_le_advertising_manager_{nullptr};

MockLeScanningManager* mock_le_scanning_manager_{nullptr};

system/test/mock/mock_main_shim_entry.h

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "hci/acl_manager_mock.h"

#include "hci/controller_interface_mock.h"

#include "hci/distance_measurement_manager_mock.h"

#include "hci/hci_layer_mock.h"

#include "hci/hci_interface.h"

#include "hci/le_advertising_manager_mock.h"

#include "hci/le_scanning_manager_mock.h"

#include "shim/dumpsys.h"
@@ -31,7 +31,7 @@ namespace testing { 
extern MockAclManager* mock_acl_manager_;

extern MockControllerInterface* mock_controller_;

extern std::function<shim::Dumpsys*()> shim_dumpsys_;

extern MockHciLayer* mock_hci_layer_;

extern HciInterface* mock_hci_layer_;

extern os::Handler* mock_gd_shim_handler_;

extern MockLeAdvertisingManager* mock_le_advertising_manager_;

extern MockLeScanningManager* mock_le_scanning_manager_;