Cleanup: move VINTF fragment into VAPEX

Bug: 296524155
Test: m && launch_cvd
    # usb hal service is running
Change-Id: I5aebf03e1f651b8cd2753627ad55022be9eba8d6
This commit is contained in:
Jooyung Han 2023-10-10 13:40:22 +09:00
parent d7447ae658
commit f9cfbd5e07
5 changed files with 8 additions and 8 deletions

View file

@ -43,9 +43,11 @@ cc_binary {
],
}
filegroup {
prebuilt_etc {
name: "android.hardware.usb-service.example.xml",
srcs: ["android.hardware.usb-service.example.xml"],
src: "android.hardware.usb-service.example.xml",
sub_dir: "vintf",
installable: false,
}
filegroup {

View file

@ -30,8 +30,8 @@ apex {
"com.android.hardware.usb.rc", // init .rc
"android.hardware.usb.accessory.prebuilt.xml",
"android.hardware.usb.host.prebuilt.xml",
"android.hardware.usb-service.example.xml",
],
vintf_fragments: [":android.hardware.usb-service.example.xml"],
}
// Replace the binary path from /vendor/bin to /apex/{name}/bin in the init .rc file

View file

@ -0,0 +1,3 @@
(/.*)? u:object_r:vendor_file:s0
/etc(/.*)? u:object_r:vendor_configs_file:s0
/bin/hw/android\.hardware\.usb-service\.example u:object_r:hal_usb_default_exec:s0

View file

@ -1,5 +0,0 @@
(/.*)? u:object_r:vendor_file:s0
# Permission XMLs
/etc/permissions(/.*)? u:object_r:vendor_configs_file:s0
# binary
/bin/hw/android\.hardware\.usb-service\.example u:object_r:hal_usb_default_exec:s0