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

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

Merge "Add secure_element HAL APEX" into main am: 446fe9a5 am: 81420f1e 

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



Change-Id: Ib5f74fa91ec4e6ac120830be75ab7ab80ac0ec7f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2417ad3 81420f1e

secure_element/aidl/default/Android.bp

+39 −3
Original line number Diff line number Diff line
@@ -11,14 +11,50 @@ cc_binary { 
    name: "android.hardware.secure_element-service.example",

    relative_install_path: "hw",

    vendor: true,

    init_rc: ["secure_element.rc"],

    vintf_fragments: ["secure_element.xml"],

    installable: false, // installed in APEX



    stl: "c++_static",

    shared_libs: [

        "libbase",

        "libbinder_ndk",

        "liblog",

    ],

    static_libs: [

        "android.hardware.secure_element-V1-ndk",

        "libbase",

    ],

    srcs: [

        "main.cpp",

    ],

}



prebuilt_etc {

    name: "secure_element.rc",

    src: "secure_element.rc",

    installable: false,

}



prebuilt_etc {

    name: "secure_element.xml",

    src: "secure_element.xml",

    sub_dir: "vintf",

    installable: false,

}



apex {

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

    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.secure_element-service.example",

    ],

    prebuilts: [

        "secure_element.rc",

        "secure_element.xml",

        "android.hardware.se.omapi.ese.prebuilt.xml", // <feature>

    ],

}

secure_element/aidl/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\.secure_element-service\.example  u:object_r:hal_secure_element_default_exec:s0
 
 No newline at end of file

secure_element/aidl/default/apex_manifest.json

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

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

    "version": 1

}
 
 No newline at end of file

secure_element/aidl/default/secure_element.rc

+1 −1
Original line number Diff line number Diff line 
service vendor.secure_element /vendor/bin/hw/android.hardware.secure_element-service.example

service vendor.secure_element /apex/com.android.hardware.secure_element/bin/hw/android.hardware.secure_element-service.example

    class hal

    user nobody

    group nobody