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

Commit 577cc0ac authored by Jooyung Han's avatar Jooyung Han Committed by Gerrit Code Review
Browse files

Merge "Create secretkeeper HAL APEX" into main

parents 965b7e57 bc192298
Loading
Loading
Loading
Loading
+33 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ rust_binary {
    name: "android.hardware.security.secretkeeper-service.nonsecure",
    relative_install_path: "hw",
    vendor: true,
    init_rc: ["secretkeeper.rc"],
    vintf_fragments: ["secretkeeper.xml"],
    installable: false, // install APEX
    prefer_rlib: true,
    rustlibs: [
        "android.hardware.security.secretkeeper-V1-rust",
        "libandroid_logger",
@@ -35,3 +35,34 @@ rust_binary {
        "src/main.rs",
    ],
}

prebuilt_etc {
    name: "secretkeeper.rc",
    src: "secretkeeper.rc",
    installable: false,
}

prebuilt_etc {
    name: "secretkeeper.xml",
    src: "secretkeeper.xml",
    sub_dir: "vintf",
    installable: false,
}

apex {
    name: "com.android.hardware.security.secretkeeper",
    manifest: "apex_manifest.json",
    file_contexts: "apex_file_contexts",
    key: "com.android.hardware.key",
    certificate: ":com.android.hardware.certificate",
    vendor: true,
    updatable: false,

    binaries: [
        "android.hardware.security.secretkeeper-service.nonsecure",
    ],
    prebuilts: [
        "secretkeeper.rc",
        "secretkeeper.xml",
    ],
}
+3 −0
Original line number Diff line number Diff line
(/.*)?                                          u:object_r:vendor_file:s0
/etc(/.*)?                                      u:object_r:vendor_configs_file:s0
/bin/hw/android\.hardware\.security\.secretkeeper-service\.nonsecure  u:object_r:hal_secretkeeper_default_exec:s0
+4 −0
Original line number Diff line number Diff line
{
    "name": "com.android.hardware.security.secretkeeper",
    "version": 1
}
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
service vendor.secretkeeper /vendor/bin/hw/android.hardware.security.secretkeeper-service.nonsecure
service vendor.secretkeeper /apex/com.android.hardware.security.secretkeeper/bin/hw/android.hardware.security.secretkeeper-service.nonsecure
    interface aidl android.hardware.security.secretkeeper.ISecretkeeper/nonsecure
    class hal
    user nobody