Merge "Remove VNDK definition(s)" into main
diff --git a/libwifi_hal/Android.bp b/libwifi_hal/Android.bp
index 9e75776..087fce6 100644
--- a/libwifi_hal/Android.bp
+++ b/libwifi_hal/Android.bp
@@ -137,7 +137,7 @@
     vendor: true,
     defaults: ["libwifi_hal_cflags_defaults"],
     srcs: ["wifi_hal_fallback.cpp"],
-    header_libs: ["libhardware_legacy_headers"]
+    header_libs: ["wifi_legacy_headers"]
 }
 
 wifi_cc_defaults {
@@ -171,7 +171,7 @@
                 defaults: ["libwifi-hal-mediatek"],
             },
             nxp: {
-                whole_static_libs: ["//vendor/nxp/boreal/wifi:libwifi-hal-nxp"],
+                whole_static_libs: ["libwifi-hal-nxp"],
             },
             realtek: {
                 whole_static_libs: ["libwifi-hal-rtk"],
@@ -216,8 +216,8 @@
     ],
     local_include_dirs: ["include"],
     export_include_dirs: ["include"],
-    header_libs: ["libhardware_legacy_headers"],
-    export_header_lib_headers: ["libhardware_legacy_headers"],
+    header_libs: ["wifi_legacy_headers"],
+    export_header_lib_headers: ["wifi_legacy_headers"],
     shared_libs: [
         "libbase",
         "libcutils",