commit 7cd6ceb835d1116d97e01fe4757cfbe8531970d5
author David Anderson <dvander@google.com> Fri Jul 12 17:34:58 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jul 12 17:34:58 2019 -0700
tree 72a41b51570bc68413435fe57780d1c59418e31b
parent 33a52284b88349e83456380b62c24d2cf7c7d44e
parent 0be952d36299537ee0a1f6db5c7bdef708ded811

Merge "libdm now requires linking to libext2_uuid." am: 9e821da9fe am: e91c2686e9 am: d26cb98c4d
am: 0be952d362

Change-Id: Icaa2f68ea5857df5dda76ebeb0ade0bbc9d26ccc

Android.bp

diff --git a/Android.bp b/Android.bp
index 5b2e600..f6e5c13 100644
--- a/Android.bp
+++ b/Android.bp
@@ -231,6 +231,7 @@
         "libhidlbase",
         "libhwbinder",
         "libkeymaster4support",
+        "libutils",
     ],
 }
 

Keymaster.h

diff --git a/Keymaster.h b/Keymaster.h
index 42a2b5d..9a0616d 100644
--- a/Keymaster.h
+++ b/Keymaster.h
@@ -115,7 +115,7 @@
     bool isSecure();
 
   private:
-    std::unique_ptr<KmDevice> mDevice;
+    sp<KmDevice> mDevice;
     DISALLOW_COPY_AND_ASSIGN(Keymaster);
     static bool hmacKeyGenerated;
 };