commit 08fec49a3b0b70e7a9ea8abd7d33d80c85a3eeae
author Marco Nelissen <marcone@google.com> Fri Sep 03 17:41:04 2021 -0700
committer Marco Nelissen <marcone@google.com> Wed Oct 20 07:51:05 2021 -0700
tree da2901de54534507d6d6e2f5f6ed141f2a3502bc
parent d08b1f778773c2048f7ebf72ad9462171fca22a0

Log if keymaster IPC takes too long

Bug: None
Test: run with very low timeout and verify it logs
Change-Id: I2818683f65c2191518373609c6171c056de55a9a

trusty/keymaster/Android.bp

diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index 7bd1d10..99d9e56 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -117,6 +117,7 @@
         "libkeymint",
         "liblog",
         "libtrusty",
+        "libutils",
     ],
     required: [
         "android.hardware.hardware_keystore.xml",
@@ -142,6 +143,7 @@
         "libtrusty",
         "libhardware",
         "libkeymaster_messages",
+        "libutils",
         "libxml2",
     ],
     export_include_dirs: ["include"],
@@ -169,6 +171,7 @@
         "libtrusty",
         "libhardware",
         "libkeymaster_messages",
+        "libutils",
         "libxml2",
     ],
     cflags: [