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

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

Merge "Fix floss build breakage "bt_transport.h" not found" into main

parents b19bf5fd 91f88c8c
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,6 @@
#include <cstdint>
#include <cstdint>


#include "bnep_int.h"
#include "bnep_int.h"
#include "bt_transport.h"
#include "bta/include/bta_sec_api.h"
#include "bta/include/bta_sec_api.h"
#include "internal_include/bt_target.h"
#include "internal_include/bt_target.h"
#include "osi/include/alarm.h"
#include "osi/include/alarm.h"
@@ -40,6 +39,7 @@
#include "stack/include/bt_psm_types.h"
#include "stack/include/bt_psm_types.h"
#include "stack/include/l2cap_interface.h"
#include "stack/include/l2cap_interface.h"
#include "types/bluetooth/uuid.h"
#include "types/bluetooth/uuid.h"
#include "types/bt_transport.h"
#include "types/raw_address.h"
#include "types/raw_address.h"


using namespace bluetooth;
using namespace bluetooth;
+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@


#include "bnep_api.h"
#include "bnep_api.h"
#include "bnep_int.h"
#include "bnep_int.h"
#include "bt_transport.h"
#include "bta/include/bta_sec_api.h"
#include "bta/include/bta_sec_api.h"
#include "hci/controller_interface.h"
#include "hci/controller_interface.h"
#include "internal_include/bt_target.h"
#include "internal_include/bt_target.h"
@@ -44,6 +43,7 @@
#include "stack/include/bt_psm_types.h"
#include "stack/include/bt_psm_types.h"
#include "stack/include/bt_types.h"
#include "stack/include/bt_types.h"
#include "stack/include/l2cap_interface.h"
#include "stack/include/l2cap_interface.h"
#include "types/bt_transport.h"
#include "types/raw_address.h"
#include "types/raw_address.h"


using namespace bluetooth;
using namespace bluetooth;
+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,6 @@


#include "bnep_api.h"
#include "bnep_api.h"
#include "bnep_int.h"
#include "bnep_int.h"
#include "bt_transport.h"
#include "hci/controller_interface.h"
#include "hci/controller_interface.h"
#include "internal_include/bt_target.h"
#include "internal_include/bt_target.h"
#include "l2cap_types.h"
#include "l2cap_types.h"
@@ -43,6 +42,7 @@
#include "stack/include/bt_types.h"
#include "stack/include/bt_types.h"
#include "stack/include/l2cap_interface.h"
#include "stack/include/l2cap_interface.h"
#include "types/bluetooth/uuid.h"
#include "types/bluetooth/uuid.h"
#include "types/bt_transport.h"
#include "types/raw_address.h"
#include "types/raw_address.h"


// TODO(b/369381361) Enfore -Wmissing-prototypes
// TODO(b/369381361) Enfore -Wmissing-prototypes
+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@
#include <cstdint>
#include <cstdint>
#include <cstring>
#include <cstring>


#include "bt_transport.h"
#include "bta/include/bta_sec_api.h"
#include "bta/include/bta_sec_api.h"
#include "hid_conn.h"
#include "hid_conn.h"
#include "hidd_api.h"
#include "hidd_api.h"
@@ -45,6 +44,7 @@
#include "stack/include/l2cap_interface.h"
#include "stack/include/l2cap_interface.h"
#include "stack/include/l2cdefs.h"
#include "stack/include/l2cdefs.h"
#include "stack/include/stack_metrics_logging.h"
#include "stack/include/stack_metrics_logging.h"
#include "types/bt_transport.h"
#include "types/raw_address.h"
#include "types/raw_address.h"


using namespace bluetooth;
using namespace bluetooth;
+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,6 @@


#include <cstdint>
#include <cstdint>


#include "bt_transport.h"
#include "bta/include/bta_sec_api.h"
#include "bta/include/bta_sec_api.h"
#include "hci_error_code.h"
#include "hci_error_code.h"
#include "hid_conn.h"
#include "hid_conn.h"
@@ -50,6 +49,7 @@
#include "stack/include/btm_log_history.h"
#include "stack/include/btm_log_history.h"
#include "stack/include/l2cap_interface.h"
#include "stack/include/l2cap_interface.h"
#include "stack/include/stack_metrics_logging.h"
#include "stack/include/stack_metrics_logging.h"
#include "types/bt_transport.h"
#include "types/raw_address.h"
#include "types/raw_address.h"


using namespace bluetooth;
using namespace bluetooth;