commit 7ff070740ec74b335ef0d6078de6240e1c8eac74
author Shawn Willden <swillden@google.com> Tue Jan 21 08:14:26 2020 -0700
committer Shawn Willden <swillden@google.com> Wed Feb 12 10:01:28 2020 -0700
tree 5b451fbe746c49ded36a4855ca6004f9690702e7
parent 4c17d5aab79baf3eec180bc6872898240dc7f966

Update wait_for_keymaster for KM41

Bug: 149351539
Test:  Build & boot
Change-Id: Icba765758789ba80726ea1972ba034d6b1b800c2
(cherry picked from commit e74b4e1f119947ed69ebf2c454508117754b82ae)

keymaster/Android.bp

diff --git a/keymaster/Android.bp b/keymaster/Android.bp
index 02d52a9..30952a6 100644
--- a/keymaster/Android.bp
+++ b/keymaster/Android.bp
@@ -21,7 +21,8 @@
     shared_libs: [
         "android.hardware.keymaster@4.0",
         "libbase",
-        "libkeymaster4support",
+        "libkeymaster4_1support",
+        "libutils",
     ],
     proprietary: true,
 }

keymaster/wait_for_strongbox.cpp

diff --git a/keymaster/wait_for_strongbox.cpp b/keymaster/wait_for_strongbox.cpp
index 8f95741..c0f4094 100644
--- a/keymaster/wait_for_strongbox.cpp
+++ b/keymaster/wait_for_strongbox.cpp
@@ -19,10 +19,10 @@
 #define LOG_TAG "wait_for_strongbox"
 #include <android-base/logging.h>
 
-#include <keymasterV4_0/Keymaster.h>
+#include <keymasterV4_1/Keymaster.h>
 
-using android::hardware::keymaster::V4_0::SecurityLevel;
-using android::hardware::keymaster::V4_0::support::Keymaster;
+using android::hardware::keymaster::V4_1::SecurityLevel;
+using android::hardware::keymaster::V4_1::support::Keymaster;
 
 useconds_t kWaitTimeMicroseconds = 1 * 1000;  // 1 milliseconds