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

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

Merge "USB APEX with AIDL implementation" am: 00c47d2e am: 08abdc12 am: 72753a58 

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



Change-Id: I3cf18fd23860647013ade1025e72b76883a74f47
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25e34ef1 72753a58

usb/1.0/default/Android.bp

+2 −12
Original line number Diff line number Diff line
@@ -21,21 +21,11 @@ package { 
    default_applicable_licenses: ["hardware_interfaces_license"],

}



filegroup {

    name: "android.hardware.usb@1.0-service.xml",

    srcs: ["android.hardware.usb@1.0-service.xml"],

}



filegroup {

    name: "android.hardware.usb@1.0-service.rc",

    srcs: ["android.hardware.usb@1.0-service.rc"],

}



cc_binary {

    name: "android.hardware.usb@1.0-service",

    defaults: ["hidl_defaults"],

    init_rc: [":android.hardware.usb@1.0-service.rc"],

    vintf_fragments: [":android.hardware.usb@1.0-service.xml"],

    init_rc: ["android.hardware.usb@1.0-service.rc"],

    vintf_fragments: ["android.hardware.usb@1.0-service.xml"],

    relative_install_path: "hw",

    vendor: true,

    srcs: [

usb/1.0/default/apex/manifest.json

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
{

  "name": "com.android.hardware.usb",

  "version": 1

}

usb/aidl/default/Android.bp

+11 −1
Original line number Diff line number Diff line
@@ -42,3 +42,13 @@ cc_binary { 
        "libutils",

    ],

}



filegroup {

    name: "android.hardware.usb-service.example.xml",

    srcs: ["android.hardware.usb-service.example.xml"],

}



filegroup {

    name: "android.hardware.usb-service.example.rc",

    srcs: ["android.hardware.usb-service.example.rc"],

}

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

+17 −16
Original line number Diff line number Diff line
@@ -27,19 +27,6 @@ android_app_certificate { 
    certificate: "com.android.hardware.usb",

}



genrule {

    name: "com.android.hardware.usb.rc-gen",

    srcs: [":android.hardware.usb@1.0-service.rc"],

    out: ["com.android.hardware.usb.rc"],

    cmd: "sed -E 's/\\/vendor/\\/apex\\/com.android.hardware.usb/' $(in) > $(out)",

}



prebuilt_etc {

    name: "com.android.hardware.usb.rc",

    src: ":com.android.hardware.usb.rc-gen",

    installable: false,

}



apex {

    name: "com.android.hardware.usb",

    manifest: "manifest.json",
@@ -49,11 +36,25 @@ apex { 
    updatable: false,

    soc_specific: true,

    use_vndk_as_stable: true,

    binaries: ["android.hardware.usb@1.0-service"],

    binaries: ["android.hardware.usb-service.example"],

    prebuilts: [

        "com.android.hardware.usb.rc",

        "com.android.hardware.usb.rc", // init .rc

        "android.hardware.usb.accessory.prebuilt.xml",

        "android.hardware.usb.host.prebuilt.xml",

    ],

    vintf_fragments: [":android.hardware.usb@1.0-service.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

genrule {

    name: "com.android.hardware.usb.rc-gen",

    srcs: [":android.hardware.usb-service.example.rc"],

    out: ["com.android.hardware.usb.rc"],

    cmd: "sed -E 's/\\/vendor/\\/apex\\/com.android.hardware.usb/' $(in) > $(out)",

}



prebuilt_etc {

    name: "com.android.hardware.usb.rc",

    src: ":com.android.hardware.usb.rc-gen",

    installable: false,

}