commit 8e4b2bfd5be4196908661ef2ff7ed491f14e1874
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 28 21:46:00 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 28 21:46:00 2022 +0000
tree d34d1b77c285ef7d82e340b346959c6e675782ce
parent 192b5569b004fc54a6f92e45ff5e7d732ec880fa
parent 048571214150989aa03db9078eb09cd86a895e7c

Merge "Update to KeyMint & iRPC v2"

trusty/keymaster/keymint/TEST_MAPPING

diff --git a/trusty/keymaster/keymint/TEST_MAPPING b/trusty/keymaster/keymint/TEST_MAPPING
new file mode 100644
index 0000000..2400ccd
--- /dev/null
+++ b/trusty/keymaster/keymint/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit" : [
+    {
+      "name" : "vts_treble_vintf_framework_test"
+    }
+  ]
+}
\ No newline at end of file

trusty/keymaster/keymint/android.hardware.security.keymint-service.trusty.xml

diff --git a/trusty/keymaster/keymint/android.hardware.security.keymint-service.trusty.xml b/trusty/keymaster/keymint/android.hardware.security.keymint-service.trusty.xml
index 7ca5050..0b995a2 100644
--- a/trusty/keymaster/keymint/android.hardware.security.keymint-service.trusty.xml
+++ b/trusty/keymaster/keymint/android.hardware.security.keymint-service.trusty.xml
@@ -1,6 +1,7 @@
 <manifest version="1.0" type="device">
     <hal format="aidl">
         <name>android.hardware.security.keymint</name>
+        <version>2</version>
         <fqname>IKeyMintDevice/default</fqname>
     </hal>
     <hal format="aidl">
@@ -13,6 +14,7 @@
     </hal>
     <hal format="aidl">
         <name>android.hardware.security.keymint</name>
+        <version>2</version>
         <fqname>IRemotelyProvisionedComponent/default</fqname>
     </hal>
 </manifest>