Migrate bluetooth imports to proto_logging

These enums are being migrated to proto_logging to decouple atoms.proto from statsd.

Ignore-AOSP-First: Requires other internal build rule changes. This
change will be cherry-picked to aosp afterwards.

Bug: 167962588
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I034d91894564010862b3bd0a4035e3e532a814b1
Merged-In: I034d91894564010862b3bd0a4035e3e532a814b1

diff --git a/btif/src/btif_sock.cc b/btif/src/btif_sock.cc
index 8c4c9c3..ba70127 100644 (file)
--- a/btif/src/btif_sock.cc
+++ b/btif/src/btif_sock.cc
@@ -22,7 +22,7 @@
 
 #include <base/logging.h>
 
-#include <frameworks/base/core/proto/android/bluetooth/enums.pb.h>
+#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
 #include <hardware/bluetooth.h>
 #include <hardware/bt_sock.h>
 

diff --git a/btif/src/btif_sock_l2cap.cc b/btif/src/btif_sock_l2cap.cc
index 105d5a1..1178ceb 100644 (file)
--- a/btif/src/btif_sock_l2cap.cc
+++ b/btif/src/btif_sock_l2cap.cc
@@ -28,7 +28,7 @@
 
 #include <mutex>
 
-#include <frameworks/base/core/proto/android/bluetooth/enums.pb.h>
+#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
 #include <hardware/bt_sock.h>
 
 #include "osi/include/allocator.h"

diff --git a/btif/src/btif_sock_rfc.cc b/btif/src/btif_sock_rfc.cc
index 3c9e26e..b9ad3a8 100644 (file)
--- a/btif/src/btif_sock_rfc.cc
+++ b/btif/src/btif_sock_rfc.cc
@@ -30,7 +30,7 @@
 
 #include <mutex>
 
-#include <frameworks/base/core/proto/android/bluetooth/enums.pb.h>
+#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
 #include <hardware/bluetooth.h>
 #include <hardware/bt_sock.h>
 

diff --git a/common/metrics.h b/common/metrics.h
index 8d83cac..c4fd14f 100644 (file)
--- a/common/metrics.h
+++ b/common/metrics.h
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <android/bluetooth/hci/enums.pb.h>
 #include <bta/include/bta_api.h>
-#include <frameworks/base/core/proto/android/bluetooth/enums.pb.h>
+#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
+#include <frameworks/proto_logging/stats/enums/bluetooth/hci/enums.pb.h>
 #include <stdint.h>
 #include <memory>
 #include <string>

diff --git a/hci/src/hci_layer.cc b/hci/src/hci_layer.cc
index 976d91d..77f0ffe 100644 (file)
--- a/hci/src/hci_layer.cc
+++ b/hci/src/hci_layer.cc
@@ -25,7 +25,7 @@
 #include <base/run_loop.h>
 #include <base/sequenced_task_runner.h>
 #include <base/threading/thread.h>
-#include <frameworks/base/core/proto/android/bluetooth/hci/enums.pb.h>
+#include <frameworks/proto_logging/stats/enums/bluetooth/hci/enums.pb.h>
 
 #include <signal.h>
 #include <string.h>

diff --git a/main/shim/hci_layer.cc b/main/shim/hci_layer.cc
index c7acdbd..a2dae0f 100644 (file)
--- a/main/shim/hci_layer.cc
+++ b/main/shim/hci_layer.cc
@@ -17,7 +17,7 @@
 #define LOG_TAG "bt_shim_hci"
 
 #include <base/bind.h>
-#include <frameworks/base/core/proto/android/bluetooth/hci/enums.pb.h>
+#include <frameworks/proto_logging/stats/enums/bluetooth/hci/enums.pb.h>
 #include <algorithm>
 #include <cstdint>
 

diff --git a/stack/btm/btm_ble_connection_establishment.cc b/stack/btm/btm_ble_connection_establishment.cc
index 77bc00f..7582727 100644 (file)
--- a/stack/btm/btm_ble_connection_establishment.cc
+++ b/stack/btm/btm_ble_connection_establishment.cc
@@ -16,8 +16,8 @@
  *
  ******************************************************************************/
 
-#include <frameworks/base/core/proto/android/bluetooth/enums.pb.h>
-#include <frameworks/base/core/proto/android/bluetooth/hci/enums.pb.h>
+#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
+#include <frameworks/proto_logging/stats/enums/bluetooth/hci/enums.pb.h>
 
 #include "bt_types.h"
 #include "btm_int.h"

diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
index 5d7d0f9..b4f0167 100644 (file)
--- a/stack/btm/btm_sec.cc
+++ b/stack/btm/btm_sec.cc
@@ -24,8 +24,8 @@
 
 #define LOG_TAG "bt_btm_sec"
 
-#include <frameworks/base/core/proto/android/bluetooth/enums.pb.h>
-#include <frameworks/base/core/proto/android/bluetooth/hci/enums.pb.h>
+#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
+#include <frameworks/proto_logging/stats/enums/bluetooth/hci/enums.pb.h>
 #include <log/log.h>
 #include <stdarg.h>
 #include <stdio.h>

diff --git a/stack/btu/btu_hcif.cc b/stack/btu/btu_hcif.cc
index 2d7033d..28897b9 100644 (file)
--- a/stack/btu/btu_hcif.cc
+++ b/stack/btu/btu_hcif.cc
@@ -32,8 +32,8 @@
 #include <base/location.h>
 #include <base/logging.h>
 #include <base/threading/thread.h>
-#include <frameworks/base/core/proto/android/bluetooth/enums.pb.h>
-#include <frameworks/base/core/proto/android/bluetooth/hci/enums.pb.h>
+#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
+#include <frameworks/proto_logging/stats/enums/bluetooth/hci/enums.pb.h>
 #include <log/log.h>
 #include <statslog.h>
 #include <stdio.h>