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

Commit 3acb58c4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11650815 from 95f6cc8b to 24Q3-release 

Change-Id: I09501f175a03c3a39120b26feb5f343db2f59274
parents c7dcc809 95f6cc8b

identity/aidl/default/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ cc_library_static { 
    ],

    static_libs: [

        "libbase",

        "libcppbor_external",

        "libcppbor",

        "libcppcose_rkp",

        "libutils",

        "libsoft_attestation_cert",
@@ -102,7 +102,7 @@ cc_binary { 
    ],

    static_libs: [

        "libbase",

        "libcppbor_external",

        "libcppbor",

        "libcppcose_rkp",

        "libutils",

        "libsoft_attestation_cert",
@@ -146,7 +146,7 @@ cc_test { 
    ],

    static_libs: [

        "libbase",

        "libcppbor_external",

        "libcppbor",

        "libcppcose_rkp",

        "libutils",

        "libsoft_attestation_cert",

identity/aidl/vts/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ cc_test { 
        "android.hardware.security.rkp-V3-cpp",

        "android.hardware.security.rkp-V3-ndk",

        "android.hardware.security.secureclock-V1-ndk",

        "libcppbor_external",

        "libcppbor",

        "libcppcose_rkp",

        "libkeymaster_portable",

        "libkeymint_vts_test_utils",

identity/support/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ cc_defaults { 
        "libpuresoftkeymasterdevice",

    ],

    static_libs: [

        "libcppbor_external",

        "libcppbor",

    ],

}
@@ -70,7 +70,7 @@ cc_test { 
    ],

    static_libs: [

        "android.hardware.identity-support-lib",

        "libcppbor_external",

        "libcppbor",

        "libgmock",

    ],

    test_suites: ["general-tests"],

security/keymint/aidl/default/Android.bp

+43 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ cc_binary { 
        "android.hardware.security.secureclock-V1-ndk",

        "libbase",

        "libbinder_ndk",

        "libcppbor_external",

        "libcppbor",

        "libcrypto",

        "libkeymaster_portable",

        "libkeymint",
@@ -115,5 +115,47 @@ rust_library { 
        "libkmr_wire",

    ],

    srcs: ["ta/lib.rs"],

}



apex {

    name: "com.android.hardware.keymint.rust_nonsecure",

    manifest: "manifest.json",

    file_contexts: "file_contexts",

    key: "com.google.cf.apex.key",

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

    soc_specific: true,

    updatable: false,

    binaries: [

        "android.hardware.security.keymint-service.nonsecure",

    ],

    prebuilts: [

        "keymint_aidl_nonsecure_init_rc",

        "keymint_aidl_nonsecure_vintf",

        "android.hardware.hardware_keystore.xml", // permissions

    ],

}



prebuilt_etc {

    name: "keymint_aidl_nonsecure_init_rc",

    filename_from_src: true,

    vendor: true,

    src: ":gen-keymint_aidl_nonsecure_init_rc",

}



genrule {

    name: "gen-keymint_aidl_nonsecure_init_rc",

    srcs: ["android.hardware.security.keymint-service.nonsecure.rc"],

    out: ["android.hardware.security.keymint-service.nonsecure.apex.rc"],

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

}



prebuilt_etc {

    name: "keymint_aidl_nonsecure_vintf",

    sub_dir: "vintf",

    vendor: true,

    srcs: [

        "android.hardware.security.keymint-service.xml",

        "android.hardware.security.sharedsecret-service.xml",

        "android.hardware.security.secureclock-service.xml",

    ],

}

security/keymint/aidl/default/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\.keymint-service\.nonsecure  u:object_r:hal_keymint_rust_exec:s0