commit 1b75929a58c32882d21d04ee1df2a60a199923bd
author Brian Young <bcyoung@google.com> Mon Jan 29 23:57:29 2018 +0000
committer Ian Pedowitz <ijpedowitz@google.com> Tue Jan 30 15:31:47 2018 +0000
tree 0e89a1c62d4735d03c16d7895c0bf798a3f56e74
parent 5407bf1ece35ebc66c8c56e36a789b6fb89659d5

Revert "Add "Unlocked device required" parameter to keys"

This reverts commit 5407bf1ece35ebc66c8c56e36a789b6fb89659d5.

Reason for revert: Build breakages on elfin, gce_x86_phone.

Bug: 72679761
Bug: 67752510
Change-Id: I1a4f8f725fe3aa7195f266ed77bbb7f4cccaa662

keystore/Android.bp

diff --git a/keystore/Android.bp b/keystore/Android.bp
index 68dde3d..cb736b3 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -84,7 +84,6 @@
     srcs: ["keystore_cli.cpp"],
     shared_libs: [
         "android.hardware.keymaster@3.0",
-        "android.hardware.keymaster@4.0",
         "libbinder",
         "libcrypto",
         "libcutils",
@@ -110,8 +109,8 @@
     srcs: ["keystore_cli_v2.cpp"],
     shared_libs: [
         "android.hardware.confirmationui@1.0",
+        "android.hardware.keymaster@3.0",
         "libbinder",
-        "android.hardware.keymaster@4.0",
         "libchrome",
         "libutils",
         "libhidlbase",