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

Commit b22f10ec authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Reduce unnecessary inclusion from mocks" am: e22a7d39 am:... 

Merge "legacy: Reduce unnecessary inclusion from mocks" am: e22a7d39 am: 67920f19 am: e7bbbe77 am: 6ba70447 am: 9e3210dd

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1836465

Change-Id: I59a4ee7c2d7509ada8ea997d351386044e9e341d
parents 89273e3c 9e3210dd

system/test/mock/mock_main_shim_metrics_api.cc

+0 −2
Original line number Diff line number Diff line
@@ -35,9 +35,7 @@ extern std::map<std::string, int> mock_function_count_map; 
//       for this effort.  This compilation unit may compile as-is, or

//       may need attention to prune the inclusion set.

#include "gd/hci/address.h"

#include "gd/os/metrics.h"

#include "main/shim/helpers.h"

#include "main/shim/metrics_api.h"

#include "types/raw_address.h"



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

system/test/mock/mock_stack_btu_hcif.cc

+1 −17
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 *   Functions generated:9

 */



#include <cstdint>

#include <map>

#include <string>
@@ -29,24 +30,7 @@ extern std::map<std::string, int> mock_function_count_map; 
#include <base/callback.h>

#include <base/location.h>



#include <cstdint>



#include "btif/include/btif_config.h"

#include "common/metrics.h"

#include "device/include/controller.h"

#include "osi/include/log.h"

#include "stack/include/acl_hci_link_interface.h"

#include "stack/include/ble_acl_interface.h"

#include "stack/include/ble_hci_link_interface.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/btm_iso_api.h"

#include "stack/include/dev_hci_link_interface.h"

#include "stack/include/gatt_api.h"

#include "stack/include/hci_evt_length.h"

#include "stack/include/inq_hci_link_interface.h"

#include "stack/include/l2cap_hci_link_interface.h"

#include "stack/include/sco_hci_link_interface.h"

#include "stack/include/sec_hci_link_interface.h"



#ifndef UNUSED_ATTR

#define UNUSED_ATTR

system/test/mock/mock_udrv_ulinux_uipc.cc

+2 −21
Original line number Diff line number Diff line
@@ -19,32 +19,13 @@ 
 *   Functions generated:12

 */



#include <cstdint>

#include <map>

#include <string>



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



#include <errno.h>

#include <fcntl.h>

#include <poll.h>

#include <signal.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <sys/mman.h>

#include <sys/prctl.h>

#include <sys/select.h>

#include <sys/socket.h>

#include <sys/stat.h>

#include <sys/un.h>

#include <unistd.h>

#include <mutex>

#include <set>

#include "audio_a2dp_hw/include/audio_a2dp_hw.h"

#include "bt_utils.h"

#include "osi/include/osi.h"

#include "osi/include/socket_utils/sockets.h"

#include "uipc.h"

#include "udrv/include/uipc.h"



#ifndef UNUSED_ATTR

#define UNUSED_ATTR

system/test/mock/mock_utils_bt.h

+1 −14
Original line number Diff line number Diff line
@@ -34,21 +34,8 @@ extern std::map<std::string, int> mock_function_count_map; 
//       still applies, but crafting proper inclusion is out of scope

//       for this effort.  This compilation unit may compile as-is, or

//       may need attention to prune from (or add to ) the inclusion set.

#include <errno.h>

#include <processgroup/sched_policy.h>

#include <pthread.h>

#include <stdio.h>

#include <stdlib.h>

#include <sys/resource.h>

#include <unistd.h>



#include <mutex>



#include "bt_utils.h"

#include "btcore/include/module.h"

#include "osi/include/compat.h"

#include "osi/include/log.h"

#include "osi/include/properties.h"

#include "utils/include/bt_utils.h"



// Mocked compile conditionals, if any

system/test/mock/mock_main_shim_metrics_api.h

+1 −1

File changed.

Contains only whitespace changes.