Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ace79e0 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Cleanup: move VINTF fragment into VAPEX" into main am: e8d679e2 am:... 

Merge "Cleanup: move VINTF fragment into VAPEX" into main am: e8d679e2 am: 81248e07 am: 764a410f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780410



Change-Id: I3fbea76f8b4ab6e130747307302500abbe2c9fd9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60b6517f 764a410f

usb/aidl/default/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -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 {

usb/apex/Android.bp→usb/aidl/default/apex/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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

usb/apex/file_contexts→usb/aidl/default/apex/file_contexts

+3 −0
Original line number Diff line number Diff line 
(/.*)?                                                 u:object_r:vendor_file:s0

# Permission XMLs

/etc/permissions(/.*)?                         u:object_r:vendor_configs_file:s0

# binary

/etc(/.*)?                                             u:object_r:vendor_configs_file:s0

/bin/hw/android\.hardware\.usb-service\.example        u:object_r:hal_usb_default_exec:s0
 
 No newline at end of file