Use libhardware_legacy headers

Bug: 273376293
Test: m libwifi-hal libwifi-hal-qcom
Test: atest CtsWifiTestCases
Merged-In: Ie11574d2482be50cd6173fbf5c551111247ffcf3
Change-Id: Ie11574d2482be50cd6173fbf5c551111247ffcf3

28 files changed, 29 insertions, 29 deletions

diff --git a/legacy/qcwcn/wifi_hal/common.cpp b/legacy/qcwcn/wifi_hal/common.cpp
index 3d72e76..60bb2dc 100644
--- a/legacy/qcwcn/wifi_hal/common.cpp
+++ b/legacy/qcwcn/wifi_hal/common.cpp
@@ -22,7 +22,7 @@
 #include <dlfcn.h>
 #include <pthread.h>
 
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "common.h"
 #include <errno.h>
 
diff --git a/legacy/qcwcn/wifi_hal/common.h b/legacy/qcwcn/wifi_hal/common.h
index 401921b..5ccd801 100644
--- a/legacy/qcwcn/wifi_hal/common.h
+++ b/legacy/qcwcn/wifi_hal/common.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 
 #ifndef __WIFI_HAL_COMMON_H__
 #define __WIFI_HAL_COMMON_H__
diff --git a/legacy/qcwcn/wifi_hal/cpp_bindings.cpp b/legacy/qcwcn/wifi_hal/cpp_bindings.cpp
index 6efec5a..04026cc 100644
--- a/legacy/qcwcn/wifi_hal/cpp_bindings.cpp
+++ b/legacy/qcwcn/wifi_hal/cpp_bindings.cpp
@@ -34,7 +34,7 @@
 #include "nl80211_copy.h"
 #include <ctype.h>
 
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "common.h"
 #include "cpp_bindings.h"
 #include "vendor_definitions.h"
diff --git a/legacy/qcwcn/wifi_hal/cpp_bindings.h b/legacy/qcwcn/wifi_hal/cpp_bindings.h
index 71d8da9..b2650f1 100644
--- a/legacy/qcwcn/wifi_hal/cpp_bindings.h
+++ b/legacy/qcwcn/wifi_hal/cpp_bindings.h
@@ -16,7 +16,7 @@
 #ifndef __WIFI_HAL_CPP_BINDINGS_H__
 #define __WIFI_HAL_CPP_BINDINGS_H__
 
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "common.h"
 #include "sync.h"
 
diff --git a/legacy/qcwcn/wifi_hal/gscancommand.h b/legacy/qcwcn/wifi_hal/gscancommand.h
index dc48ef6..ff77aa2 100644
--- a/legacy/qcwcn/wifi_hal/gscancommand.h
+++ b/legacy/qcwcn/wifi_hal/gscancommand.h
@@ -26,7 +26,7 @@
 #define PRINTF_FORMAT(a,b)
 #define STRUCT_PACKED
 #endif
-#include "gscan.h"
+#include <hardware_legacy/gscan.h>
 
 #ifdef __cplusplus
 extern "C"
diff --git a/legacy/qcwcn/wifi_hal/ifaceeventhandler.h b/legacy/qcwcn/wifi_hal/ifaceeventhandler.h
index d055a1b..d297284 100644
--- a/legacy/qcwcn/wifi_hal/ifaceeventhandler.h
+++ b/legacy/qcwcn/wifi_hal/ifaceeventhandler.h
@@ -39,7 +39,7 @@
 #define STRUCT_PACKED
 #endif
 #include "vendor_definitions.h"
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 
 #ifdef __cplusplus
 extern "C"
diff --git a/legacy/qcwcn/wifi_hal/llstats.cpp b/legacy/qcwcn/wifi_hal/llstats.cpp
index 8e827e2..5054ac5 100644
--- a/legacy/qcwcn/wifi_hal/llstats.cpp
+++ b/legacy/qcwcn/wifi_hal/llstats.cpp
@@ -20,7 +20,7 @@
 
 #include <utils/Log.h>
 
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "common.h"
 #include "cpp_bindings.h"
 #include "llstatscommand.h"
diff --git a/legacy/qcwcn/wifi_hal/llstatscommand.h b/legacy/qcwcn/wifi_hal/llstatscommand.h
index 86b9672..da2f8dd 100644
--- a/legacy/qcwcn/wifi_hal/llstatscommand.h
+++ b/legacy/qcwcn/wifi_hal/llstatscommand.h
@@ -37,7 +37,7 @@
 #include "nl80211_copy.h"
 #include "common.h"
 #include "cpp_bindings.h"
-#include "link_layer_stats.h"
+#include <hardware_legacy/link_layer_stats.h>
 
 #ifdef __GNUC__
 #define PRINTF_FORMAT(a,b) __attribute__ ((format (printf, (a), (b))))
diff --git a/legacy/qcwcn/wifi_hal/nan.cpp b/legacy/qcwcn/wifi_hal/nan.cpp
index 9e74cea..955471c 100644
--- a/legacy/qcwcn/wifi_hal/nan.cpp
+++ b/legacy/qcwcn/wifi_hal/nan.cpp
@@ -16,7 +16,7 @@
 
 #include "sync.h"
 
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "nan_i.h"
 #include "common.h"
 #include "cpp_bindings.h"
diff --git a/legacy/qcwcn/wifi_hal/nan_i.h b/legacy/qcwcn/wifi_hal/nan_i.h
index 78cdb1a..0c9586f 100644
--- a/legacy/qcwcn/wifi_hal/nan_i.h
+++ b/legacy/qcwcn/wifi_hal/nan_i.h
@@ -19,7 +19,7 @@
 
 #include "common.h"
 #include "cpp_bindings.h"
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 
 #ifdef __cplusplus
 extern "C"
diff --git a/legacy/qcwcn/wifi_hal/nan_ind.cpp b/legacy/qcwcn/wifi_hal/nan_ind.cpp
index 1fe651d..7e7c7c8 100644
--- a/legacy/qcwcn/wifi_hal/nan_ind.cpp
+++ b/legacy/qcwcn/wifi_hal/nan_ind.cpp
@@ -17,7 +17,7 @@
 #include "sync.h"
 #include <utils/Log.h>
 #include <errno.h>
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "nan_i.h"
 #include "nancommand.h"
 #include <errno.h>
diff --git a/legacy/qcwcn/wifi_hal/nan_req.cpp b/legacy/qcwcn/wifi_hal/nan_req.cpp
index 4452783..265e39a 100644
--- a/legacy/qcwcn/wifi_hal/nan_req.cpp
+++ b/legacy/qcwcn/wifi_hal/nan_req.cpp
@@ -16,7 +16,7 @@
 
 #include "sync.h"
 #include <utils/Log.h>
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "nan_i.h"
 #include "nancommand.h"
 
diff --git a/legacy/qcwcn/wifi_hal/nan_rsp.cpp b/legacy/qcwcn/wifi_hal/nan_rsp.cpp
index f0b9b1c..9074bfd 100644
--- a/legacy/qcwcn/wifi_hal/nan_rsp.cpp
+++ b/legacy/qcwcn/wifi_hal/nan_rsp.cpp
@@ -16,7 +16,7 @@
 
 #include "sync.h"
 #include <utils/Log.h>
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "nan_i.h"
 #include "nancommand.h"
 
diff --git a/legacy/qcwcn/wifi_hal/nancommand.h b/legacy/qcwcn/wifi_hal/nancommand.h
index 8a16248..6f8d419 100644
--- a/legacy/qcwcn/wifi_hal/nancommand.h
+++ b/legacy/qcwcn/wifi_hal/nancommand.h
@@ -19,7 +19,7 @@
 
 #include "common.h"
 #include "cpp_bindings.h"
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "nan_cert.h"
 
 class NanCommand : public WifiVendorCommand
diff --git a/legacy/qcwcn/wifi_hal/radio_mode.cpp b/legacy/qcwcn/wifi_hal/radio_mode.cpp
index 9ed211f..19f9f1a 100644
--- a/legacy/qcwcn/wifi_hal/radio_mode.cpp
+++ b/legacy/qcwcn/wifi_hal/radio_mode.cpp
@@ -30,7 +30,7 @@
 
 #include <utils/Log.h>
 
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "common.h"
 #include "cpp_bindings.h"
 #include "radio_mode.h"
diff --git a/legacy/qcwcn/wifi_hal/rb_wrapper.cpp b/legacy/qcwcn/wifi_hal/rb_wrapper.cpp
index 9017d21..5f6b92b 100644
--- a/legacy/qcwcn/wifi_hal/rb_wrapper.cpp
+++ b/legacy/qcwcn/wifi_hal/rb_wrapper.cpp
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 
 #include "sync.h"
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "common.h"
 
 #include "ring_buffer.h"
diff --git a/legacy/qcwcn/wifi_hal/rssi_monitor.cpp b/legacy/qcwcn/wifi_hal/rssi_monitor.cpp
index 832bbc3..aa8291a 100644
--- a/legacy/qcwcn/wifi_hal/rssi_monitor.cpp
+++ b/legacy/qcwcn/wifi_hal/rssi_monitor.cpp
@@ -32,7 +32,7 @@
 
 #include <utils/Log.h>
 
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "common.h"
 #include "cpp_bindings.h"
 #include "rssi_monitor.h"
diff --git a/legacy/qcwcn/wifi_hal/rtt.cpp b/legacy/qcwcn/wifi_hal/rtt.cpp
index b295ab6..69bc126 100644
--- a/legacy/qcwcn/wifi_hal/rtt.cpp
+++ b/legacy/qcwcn/wifi_hal/rtt.cpp
@@ -35,8 +35,8 @@
 
 #include "common.h"
 #include "cpp_bindings.h"
-#include "rtt.h"
-#include "wifi_hal.h"
+#include <hardware_legacy/rtt.h>
+#include <hardware_legacy/wifi_hal.h>
 #include "wifihal_internal.h"
 
 /* Implementation of the API functions exposed in rtt.h */
diff --git a/legacy/qcwcn/wifi_hal/sync.h b/legacy/qcwcn/wifi_hal/sync.h
index eaa9f11..664c2da 100644
--- a/legacy/qcwcn/wifi_hal/sync.h
+++ b/legacy/qcwcn/wifi_hal/sync.h
@@ -15,7 +15,7 @@
  */
 
 #include <pthread.h>
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "common.h"
 
 #ifndef __WIFI_HAL_SYNC_H__
diff --git a/legacy/qcwcn/wifi_hal/tdls.cpp b/legacy/qcwcn/wifi_hal/tdls.cpp
index f12816f..6c1b364 100644
--- a/legacy/qcwcn/wifi_hal/tdls.cpp
+++ b/legacy/qcwcn/wifi_hal/tdls.cpp
@@ -32,7 +32,7 @@
 
 #include <utils/Log.h>
 
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "common.h"
 #include "cpp_bindings.h"
 #include "tdlsCommand.h"
diff --git a/legacy/qcwcn/wifi_hal/tdlsCommand.h b/legacy/qcwcn/wifi_hal/tdlsCommand.h
index 565e9b3..561940f 100755
--- a/legacy/qcwcn/wifi_hal/tdlsCommand.h
+++ b/legacy/qcwcn/wifi_hal/tdlsCommand.h
@@ -49,7 +49,7 @@
 #include "nl80211_copy.h"
 #include "common.h"
 #include "cpp_bindings.h"
-#include "tdls.h"
+#include <hardware_legacy/tdls.h>
 
 #ifdef __GNUC__
 #define PRINTF_FORMAT(a,b) __attribute__ ((format (printf, (a), (b))))
diff --git a/legacy/qcwcn/wifi_hal/wifi_hal.cpp b/legacy/qcwcn/wifi_hal/wifi_hal.cpp
index cb4b8e7..d4f97a0 100644
--- a/legacy/qcwcn/wifi_hal/wifi_hal.cpp
+++ b/legacy/qcwcn/wifi_hal/wifi_hal.cpp
@@ -82,7 +82,7 @@
 
 #define LOG_TAG  "WifiHAL"
 
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "wifi_hal_ctrl.h"
 #include "common.h"
 #include "cpp_bindings.h"
diff --git a/legacy/qcwcn/wifi_hal/wificonfigcommand.h b/legacy/qcwcn/wifi_hal/wificonfigcommand.h
index bbe89a0..9caef8d 100644
--- a/legacy/qcwcn/wifi_hal/wificonfigcommand.h
+++ b/legacy/qcwcn/wifi_hal/wificonfigcommand.h
@@ -38,7 +38,7 @@
 #define PRINTF_FORMAT(a,b)
 #define STRUCT_PACKED
 #endif
-#include "wifi_config.h"
+#include <hardware_legacy/wifi_config.h>
 
 #ifdef __cplusplus
 extern "C"
diff --git a/legacy/qcwcn/wifi_hal/wifihal_internal.h b/legacy/qcwcn/wifi_hal/wifihal_internal.h
index 5cc78c3..6daf48a 100755
--- a/legacy/qcwcn/wifi_hal/wifihal_internal.h
+++ b/legacy/qcwcn/wifi_hal/wifihal_internal.h
@@ -34,7 +34,7 @@
  * purposes of initialization, rtt and gscan.
  */
 
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "list.h"
 #include "sys/un.h"
 
diff --git a/legacy/qcwcn/wifi_hal/wifihal_vendor.cpp b/legacy/qcwcn/wifi_hal/wifihal_vendor.cpp
index f408342..f945171 100644
--- a/legacy/qcwcn/wifi_hal/wifihal_vendor.cpp
+++ b/legacy/qcwcn/wifi_hal/wifihal_vendor.cpp
@@ -33,7 +33,7 @@
 
 #include <utils/Log.h>
 
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "common.h"
 #include "cpp_bindings.h"
 #include "wifihal_vendorcommand.h"
diff --git a/legacy/qcwcn/wifi_hal/wifilogger.cpp b/legacy/qcwcn/wifi_hal/wifilogger.cpp
index ee9efa1..018d76e 100644
--- a/legacy/qcwcn/wifi_hal/wifilogger.cpp
+++ b/legacy/qcwcn/wifi_hal/wifilogger.cpp
@@ -28,7 +28,7 @@
 
 #include "sync.h"
 
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "common.h"
 #include "cpp_bindings.h"
 #include <errno.h>
diff --git a/legacy/qcwcn/wifi_hal/wifilogger_diag.h b/legacy/qcwcn/wifi_hal/wifilogger_diag.h
index fc23cb7..e7a0676 100644
--- a/legacy/qcwcn/wifi_hal/wifilogger_diag.h
+++ b/legacy/qcwcn/wifi_hal/wifilogger_diag.h
@@ -30,7 +30,7 @@
 #define __WIFI_HAL_WIFILOGGER_DIAG_H__
 
 #include "common.h"
-#include "wifi_hal.h"
+#include <hardware_legacy/wifi_hal.h>
 #include "wifilogger_event_defs.h"
 
 #include <netlink/genl/genl.h>
diff --git a/legacy/qcwcn/wifi_hal/wifiloggercmd.h b/legacy/qcwcn/wifi_hal/wifiloggercmd.h
index f9535ce..17c8574 100644
--- a/legacy/qcwcn/wifi_hal/wifiloggercmd.h
+++ b/legacy/qcwcn/wifi_hal/wifiloggercmd.h
@@ -31,7 +31,7 @@
 
 #include "common.h"
 #include "cpp_bindings.h"
-#include "wifi_logger.h"
+#include <hardware_legacy/wifi_logger.h>
 #include "wifilogger_diag.h"
 
 #ifdef __cplusplus