commit c80eab95a7f06192f744713172ead4996151b840
author Xin Li <delphij@google.com> Wed Nov 06 10:31:24 2024 -0800
committer Xin Li <delphij@google.com> Wed Nov 06 10:31:24 2024 -0800
tree 1932bb48ad5611cca9aece957c1eb2772695d008
parent 80390943513e2c324f25c9b5fc4bb7769c4fcf8f
parent 47af8d907c2a92453e7c78570973f1c47c2ae3c9

Merge 24Q4 (ab/12406339) into aosp-main-future

Bug: 370570306
Merged-In: If459e2d5e31c685b331fbf52273a1f1ea8072b32
Change-Id: I37fedbdff3205f94794d567e2d9d78192639d65c

hostapd/Android.bp

diff --git a/hostapd/Android.bp b/hostapd/Android.bp
index 8b79dd5..fb414d0 100644
--- a/hostapd/Android.bp
+++ b/hostapd/Android.bp
@@ -355,3 +355,10 @@
         "src/utils/wpa_debug.c",
     ],
 }
+
+prebuilt_etc {
+    name: "android.hardware.wifi.hostapd.xml.prebuilt",
+    src: "android.hardware.wifi.hostapd.xml",
+    relative_install_path: "vintf",
+    installable: false,
+}

wpa_supplicant/aidl/Android.bp

diff --git a/wpa_supplicant/aidl/Android.bp b/wpa_supplicant/aidl/Android.bp
index a2ce7e8..5976ff9 100644
--- a/wpa_supplicant/aidl/Android.bp
+++ b/wpa_supplicant/aidl/Android.bp
@@ -83,3 +83,10 @@
         },
     },
 }
+
+prebuilt_etc {
+    name: "android.hardware.wifi.supplicant.xml.prebuilt",
+    src: "android.hardware.wifi.supplicant.xml",
+    relative_install_path: "vintf",
+    installable: false,
+}