commit 410bb2e0d81666e23e81c8487bfb74cab6ce2ae7
author Matthew Maurer <mmaurer@google.com> Tue Sep 10 19:09:04 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 10 19:09:04 2019 +0000
tree 7ba03e8d0d6af8ecdb705aeb53864ae0b723bef9
parent 6738181c1fcbb8876c468c5d3beec0cd69440ac5
parent 097f768fa976a6e9d3579b8c6ea30eecf8e72696

Merge "Provide VINTF for Trusty Keymaster"

trusty/keymaster/4.0/android.hardware.keymaster@4.0-service.trusty.xml

diff --git a/trusty/keymaster/4.0/android.hardware.keymaster@4.0-service.trusty.xml b/trusty/keymaster/4.0/android.hardware.keymaster@4.0-service.trusty.xml
new file mode 100644
index 0000000..aa30707
--- /dev/null
+++ b/trusty/keymaster/4.0/android.hardware.keymaster@4.0-service.trusty.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.keymaster</name>
+        <transport>hwbinder</transport>
+        <version>4.0</version>
+        <interface>
+        <name>IKeymasterDevice</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>

trusty/keymaster/Android.bp

diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index 3a9beaf..f32a69e 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -136,4 +136,6 @@
         "libkeymaster4",
         "android.hardware.keymaster@4.0"
     ],
+
+    vintf_fragments: ["4.0/android.hardware.keymaster@4.0-service.trusty.xml"],
 }