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

Commit 470ee447 authored by Shawn Willden's avatar Shawn Willden Committed by Automerger Merge Worker
Browse files

Merge "Splitting out Trusty IPC into a library." into sc-dev am: 2efdeec6 

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

Change-Id: I1eda37fa715b0ec19a6a788a3f6018d2a8799388
parents e227beed 2efdeec6

trusty/keymaster/Android.bp

+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,

trusty/keymaster/include/trusty_keymaster/ipc/keymaster_ipc.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,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__