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

Commit 04210210 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Mock static initialization order 23" am: b322e4ff 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2476705



Change-Id: I5ad3522c327e004c753aab0b0e9b87eeac65319c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ae42d1d b322e4ff

system/test/common/mock_functions.cc

+1 −4
Original line number Diff line number Diff line
@@ -20,11 +20,8 @@ 


#include "osi/include/log.h"



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



static std::map<std::string, int>& _get_func_call_count_map() {

  // TODO(265217208) return singleton map instead

  // static std::map<std::string, int> mock_function_count_map;

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

  return mock_function_count_map;

}

system/test/common/mock_functions.h

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ 
#include <map>

#include <string>



// TODO(265217208) Remove

// Usage is deprecated, use get_func_call_count / inc_func_call_count instead

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



int get_func_call_size();



int get_func_call_count(const char* fn);