commit 8f82879901968d9793705eb1d06c9b32607ced13
author Paul Crowley <paulcrowley@google.com> Wed Feb 07 14:41:26 2018 -0800
committer Paul Crowley <paulcrowley@google.com> Wed May 09 12:59:18 2018 -0700
tree 984214e2129e6dea17907cbd80fcd240361d7357
parent 4a04cad4ec65dc9e069809e1756242e63ab18ff5

add wait_for_keymaster

Bug: 79228237
Test: boots with patch
Change-Id: I581bcd4c4dd92c5b7be70eb351ecba20225e1eee

Android.bp

diff --git a/Android.bp b/Android.bp
index b18d7c4..a8934fc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -163,6 +163,7 @@
     required: [
         "mke2fs",
         "vold_prepare_subdirs",
+        "wait_for_keymaster",
     ],
 }
 
@@ -184,6 +185,28 @@
 }
 
 cc_binary {
+    name: "wait_for_keymaster",
+    defaults: ["vold_default_flags"],
+
+    srcs: [
+        "wait_for_keymaster.cpp",
+        "Keymaster.cpp",
+    ],
+    shared_libs: [
+        "libbase",
+        "libbinder",
+
+        "android.hardware.keymaster@3.0",
+        "android.hardware.keymaster@4.0",
+        "libhardware",
+        "libhardware_legacy",
+        "libhidlbase",
+        "libhwbinder",
+        "libkeymaster4support",
+    ],
+}
+
+cc_binary {
     name: "secdiscard",
     defaults: ["vold_default_flags"],