From caad2b9831a8587c68f6a9185a0ba506f79d0ec2 Mon Sep 17 00:00:00 2001
From: Jooyung Han <jooyung@google.com>
Date: Fri, 27 Jan 2023 11:23:51 +0900
Subject: [PATCH] wifi: put vintf fragment into wifi apex

The AOSP-version of wifi hal apex now contains the VINTF fragment in it.

Bug: 247018693
Bug: 266885060
Test: atest CtsWifiTestCases
Merged-In: Id8f196386967c3023cb5ee308d31b8cdeed7df0b
Change-Id: Id8f196386967c3023cb5ee308d31b8cdeed7df0b
---
 compatibility_matrices/compatibility_matrix.8.xml | 4 ++--
 wifi/apex/Android.bp                              | 2 +-
 wifi/apex/file_contexts                           | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compatibility_matrices/compatibility_matrix.8.xml b/compatibility_matrices/compatibility_matrix.8.xml
index 64bfc7ac34..7b340ce83c 100644
--- a/compatibility_matrices/compatibility_matrix.8.xml
+++ b/compatibility_matrices/compatibility_matrix.8.xml
@@ -802,7 +802,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
+    <hal format="aidl" optional="true" updatable-via-apex="true">
         <name>android.hardware.wifi</name>
         <version>1</version>
         <interface>
@@ -810,7 +810,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="hidl" optional="true" updatable-via-apex="true">
         <name>android.hardware.wifi</name>
         <version>1.3-6</version>
         <interface>
diff --git a/wifi/apex/Android.bp b/wifi/apex/Android.bp
index 0afb96b85d..45f17a638d 100644
--- a/wifi/apex/Android.bp
+++ b/wifi/apex/Android.bp
@@ -30,6 +30,7 @@ prebuilt_etc {
     name: "com.android.hardware.wifi.xml",
     src: ":default-android.hardware.wifi@1.0-service.xml",
     installable: false,
+    sub_dir: "vintf",
 }
 
 apex {
@@ -38,7 +39,6 @@ apex {
     key: "com.android.hardware.wifi.key",
     certificate: ":com.android.hardware.wifi.certificate",
     file_contexts: "file_contexts",
-    vintf_fragments: [":com.android.hardware.wifi.xml"],
     use_vndk_as_stable: true,
     updatable: false,
     soc_specific: true,
diff --git a/wifi/apex/file_contexts b/wifi/apex/file_contexts
index 812d51db58..04e8a62fd6 100644
--- a/wifi/apex/file_contexts
+++ b/wifi/apex/file_contexts
@@ -1,3 +1,3 @@
-(/.*)? 								u:object_r:vendor_file:s0
-/bin/hw/android\.hardware\.wifi@1.0-service			u:object_r:hal_wifi_default_exec:s0
-
+(/.*)?                                          u:object_r:vendor_file:s0
+/etc(/.*)?                                      u:object_r:vendor_configs_file:s0
+/bin/hw/android\.hardware\.wifi@1.0-service     u:object_r:hal_wifi_default_exec:s0