Merge "wifi: put vintf fragment into wifi apex"

This commit is contained in:
Treehugger Robot
2023-01-31 02:57:52 +00:00
committed by Gerrit Code Review
3 changed files with 6 additions and 6 deletions

View File

@@ -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>

View File

@@ -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,

View File

@@ -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