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

Commit 70ef8336 authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Splitting out Trusty IPC into a library." am: a2aba786

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1768405

Change-Id: I424fe1ad17968c515b9a8e8426db4dd7a69b1fc9
parents f68c4ba1 a2aba786
Loading
Loading
Loading
Loading
+21 −0
Original line number Diff line number Diff line
@@ -129,6 +129,27 @@ prebuilt_etc {
    src: "set_attestation_key/keymaster_soft_attestation_keys.xml",
}

cc_library {
    name: "libtrusty_ipc",
    vendor: true,
    srcs: ["ipc/trusty_keymaster_ipc.cpp"],
    local_include_dirs: ["include"],
    shared_libs: [
        "libc",
        "libcrypto",
        "liblog",
        "libtrusty",
        "libhardware",
        "libkeymaster_messages",
        "libxml2",
    ],
    export_include_dirs: ["include"],
    cflags: [
        "-Wall",
        "-Werror",
    ],
}

cc_binary {
    name: "trusty_keymaster_set_attestation_key",
    vendor: true,
+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ enum keymaster_command : uint32_t {
    KM_SET_PRODUCT_ID = (0x9000 << KEYMASTER_REQ_SHIFT),
    KM_CLEAR_ATTESTATION_CERT_CHAIN = (0xa000 << KEYMASTER_REQ_SHIFT),
    KM_SET_WRAPPED_ATTESTATION_KEY = (0xb000 << KEYMASTER_REQ_SHIFT),
    KM_SET_ATTESTATION_IDS = (0xc000 << KEYMASTER_REQ_SHIFT)
};

#ifdef __ANDROID__