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

Commit a252ec38 authored by Daniel Norman's avatar Daniel Norman Committed by Automerger Merge Worker
Browse files

Merge "Merge "Creates a vendor APEX for the default vibrator HAL service." am:... 

Merge "Merge "Creates a vendor APEX for the default vibrator HAL service." am: dca9f885" into stage-aosp-master am: 9e0ab80b am: 2fdcd811 am: f13bf1a1

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

Change-Id: I7d774c6539fd5b03c02ca1c8628c881688b4ce2e
parents 9143ef77 f13bf1a1

vibrator/aidl/default/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -26,11 +26,16 @@ cc_library_static { 
    ],

}



filegroup {

    name: "android.hardware.vibrator.xml",

    srcs: ["android.hardware.vibrator.xml"],

}



cc_binary {

    name: "android.hardware.vibrator-service.example",

    relative_install_path: "hw",

    init_rc: ["vibrator-default.rc"],

    vintf_fragments: ["vibrator-default.xml"],

    vintf_fragments: [":android.hardware.vibrator.xml"],

    vendor: true,

    shared_libs: [

        "libbase",

vibrator/aidl/default/apex/Android.bp

0 → 100644
+41 −0
Original line number Diff line number Diff line 
package {

    default_applicable_licenses: ["hardware_interfaces_license"],

}



apex_key {

    name: "com.android.hardware.vibrator.key",

    public_key: "com.android.hardware.vibrator.avbpubkey",

    private_key: "com.android.hardware.vibrator.pem",

}



android_app_certificate {

    name: "com.android.hardware.vibrator.certificate",

    certificate: "com.android.hardware.vibrator",

}



prebuilt_etc {

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

    src: "com.android.hardware.vibrator.rc",

    installable: false,

}



apex {

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

    manifest: "apex_manifest.json",

    key: "com.android.hardware.vibrator.key",

    certificate: ":com.android.hardware.vibrator.certificate",

    file_contexts: "file_contexts",

    use_vndk_as_stable: true,

    updatable: false,

    // Install the apex in /vendor/apex

    soc_specific: true,

    binaries: [

        "android.hardware.vibrator-service.example",

    ],

    prebuilts: [

        "com.android.hardware.vibrator.rc",

    ],

    vintf_fragments: [":android.hardware.vibrator.xml"],

    // vibrator.default.so is not needed by the AIDL service binary.

    overrides: ["vibrator.default"],

}

vibrator/aidl/default/apex/apex_manifest.json

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

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

  "version": 1

}

vibrator/aidl/default/apex/com.android.hardware.vibrator.avbpubkey

0 → 100644
+1.01 KiB

File added.

No diff preview for this file type.

View file