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

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

Merge "Add authgraph HAL APEX" into main am: 28b3387f 

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



Change-Id: I77d25b88846ac865b52348d7a6fd7bee25520dca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48b1beb6 28b3387f

security/authgraph/default/Android.bp

+33 −2
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ rust_binary { 
    name: "android.hardware.security.authgraph-service.nonsecure",

    relative_install_path: "hw",

    vendor: true,

    init_rc: ["authgraph.rc"],

    vintf_fragments: ["authgraph.xml"],

    installable: false, // install com.android.hardware.security.authgraph

    defaults: [

        "authgraph_use_latest_hal_aidl_rust",

    ],

    prefer_rlib: true,

    rustlibs: [

        "libandroid_logger",

        "libauthgraph_hal",
@@ -80,3 +80,34 @@ rust_fuzz { 
        ],

    },

}



prebuilt_etc {

    name: "authgraph.xml",

    src: "authgraph.xml",

    sub_dir: "vintf",

    installable: false,

}



prebuilt_etc {

    name: "authgraph.rc",

    src: "authgraph.rc",

    installable: false,

}



apex {

    name: "com.android.hardware.security.authgraph",

    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.authgraph-service.nonsecure",

    ],

    prebuilts: [

        "authgraph.rc",

        "authgraph.xml",

    ],

}

security/authgraph/default/apex_file_contexts

0 → 100644
+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\.authgraph-service\.nonsecure  u:object_r:hal_authgraph_default_exec:s0

security/authgraph/default/apex_manifest.json

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

    "name": "com.android.hardware.security.authgraph",

    "version": 1

}
 
 No newline at end of file

security/authgraph/default/authgraph.rc

+1 −1
Original line number Diff line number Diff line 
service vendor.authgraph /vendor/bin/hw/android.hardware.security.authgraph-service.nonsecure

service vendor.authgraph /apex/com.android.hardware.security.authgraph/bin/hw/android.hardware.security.authgraph-service.nonsecure

    interface aidl android.hardware.security.authgraph.IAuthGraph/nonsecure

    class hal

    user nobody