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

Commit e6a2920b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Mock static initialization order 06"

parents 996963b8 0faf0ef9

system/stack/test/common/mock_main_shim.cc

+1 −2
Original line number Diff line number Diff line
@@ -22,12 +22,11 @@ 
#include <map>

#include <string>



extern std::map<std::string, int> mock_function_count_map;



#define LOG_TAG "bt_shim"

#include "gd/common/init_flags.h"

#include "main/shim/entry.h"

#include "main/shim/shim.h"

#include "test/common/mock_functions.h"



#ifndef UNUSED_ATTR

#define UNUSED_ATTR

system/test/mock/mock_main_bte.cc

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
#include <map>

#include <string>



extern std::map<std::string, int> mock_function_count_map;



// Mock include file to share data between tests and mock

#include "stack/include/bt_hdr.h"

#include "test/mock/mock_main_bte.h"

system/test/mock/mock_main_bte.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <map>

#include <string>



extern std::map<std::string, int> mock_function_count_map;

#include "test/common/mock_functions.h"



// Original included files, if any

// NOTE: Since this is a mock file with mock definitions some number of

system/test/mock/mock_main_shim.cc

+1 −2
Original line number Diff line number Diff line
@@ -22,13 +22,12 @@ 
#include <map>

#include <string>



extern std::map<std::string, int> mock_function_count_map;



#define LOG_TAG "bt_shim"



#include "gd/common/init_flags.h"

#include "main/shim/entry.h"

#include "main/shim/shim.h"

#include "test/common/mock_functions.h"



#ifndef UNUSED_ATTR

#define UNUSED_ATTR

system/test/mock/mock_main_shim_acl.cc

+1 −2
Original line number Diff line number Diff line
@@ -23,9 +23,8 @@ 
#include <map>

#include <string>



extern std::map<std::string, int> mock_function_count_map;



#include "main/shim/acl_api.h"

#include "test/common/mock_functions.h"

#include "types/ble_address_with_type.h"

#include "types/raw_address.h"