| commit | dbc6027fdeaf0657ee4e84f599d6fe3cbc697b7c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Feb 28 22:04:25 2022 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 28 22:04:25 2022 |
| tree | d34d1b77c285ef7d82e340b346959c6e675782ce | |
| parent | 793e1777b51321c20395e1b8148626d0f5f2e5af [diff] | |
| parent | 8e4b2bfd5be4196908661ef2ff7ed491f14e1874 [diff] |
Merge "Update to KeyMint & iRPC v2" am: 8e4b2bfd5b Original change: https://android-review.googlesource.com/c/platform/system/core/+/2002271 Change-Id: I1207f05e419109cc38f8944d7b1b1ce9fbaef87b
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
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>