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

Commit f69349ad authored by Marco Ballesio's avatar Marco Ballesio Committed by Gerrit Code Review
Browse files

Merge changes from topic "revert-1512835-CUDUBMDOSD" 

* changes:
  Revert "Canonicalize include files"
  Revert "enum-ify fixed_cid stack/include/l2cdefs::L2CAP_"
  Revert "Introduce net_test_stack_btm"
  Revert "Explicit use base::Location stack/btu/btu_hcif::"
  Revert "Add various stack/test/common/mock_"
parents ae4dac81 46e556c1

system/bta/dm/bta_dm_int.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -26,9 +26,9 @@ 




#include <memory>

#include <memory>

#include "bt_target.h"

#include "bt_target.h"

#include "bta/sys/bta_sys.h"

#include "bta_sys.h"





#include "bta/include/bta_gatt_api.h"

#include "bta_gatt_api.h"





/*****************************************************************************

/*****************************************************************************

 *  Constants and data types

 *  Constants and data types

system/bta/include/utl.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 
#define UTL_H

#define UTL_H





#include "bt_types.h"

#include "bt_types.h"

#include "utils/include/bt_utils.h"

#include "bt_utils.h"





/*****************************************************************************

/*****************************************************************************

 *  Constants

 *  Constants

system/bta/sys/bta_sys_conn.cc

+4 −4
Original line number Original line Diff line number Diff line
@@ -25,11 +25,11 @@ 
#include <stddef.h>

#include <stddef.h>





#include "bt_common.h"

#include "bt_common.h"

#include "bta/include/bta_api.h"

#include "bta_api.h"

#include "bta/include/utl.h"

#include "bta_sys.h"

#include "bta/sys/bta_sys.h"

#include "bta_sys_int.h"

#include "bta/sys/bta_sys_int.h"

#include "osi/include/osi.h"

#include "osi/include/osi.h"

#include "utl.h"





/*******************************************************************************

/*******************************************************************************

 *

 *

system/btif/include/btif_hd.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <hardware/bluetooth.h>

#include <hardware/bluetooth.h>

#include <hardware/bt_hd.h>

#include <hardware/bt_hd.h>

#include <stdint.h>

#include <stdint.h>

#include "bta/include/bta_hd_api.h"

#include "bta_hd_api.h"





typedef enum {

typedef enum {

  BTIF_HD_DISABLED = 0,

  BTIF_HD_DISABLED = 0,

system/btif/include/btif_hh.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <hardware/bt_hh.h>

#include <hardware/bt_hh.h>

#include <pthread.h>

#include <pthread.h>

#include <stdint.h>

#include <stdint.h>

#include "bta/include/bta_hh_api.h"

#include "bta_hh_api.h"

#include "btu.h"

#include "btu.h"

#include "osi/include/fixed_queue.h"

#include "osi/include/fixed_queue.h"