commit db87aa56e7d691a3000b0671fd9ba5ee1e2e1c4a
author Matthew Maurer <mmaurer@google.com> Mon Sep 09 17:20:32 2019 -0700
committer Matthew Maurer <mmaurer@google.com> Mon Sep 09 17:20:32 2019 -0700
tree 82c971c57e9f8f9900f45e19ddb7d562be7c884a
parent 977f4c86a8937272b1b1cbe1d94a56d3469114c6

Remove Keymaster declaration from manifest

With the accompanying change to system/core/trusty, we now provide a
vintf manifest for Trusty keymaster, and do not need it redeclared in
the central file.

Test: lunch qemu_trusty_arm64-userdebug; m
Change-Id: Id6419db50185c6e7473318f24532a57050097686

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index c7dfb2d..8c39798 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -53,15 +53,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.keymaster</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IKeymasterDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.graphics.allocator</name>
         <transport>hwbinder</transport>
         <version>2.0</version>