commit d7490eaa8cad5072f8d0e2cef3989329849f7d07
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Nov 14 17:29:49 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 14 17:29:49 2024 +0000
tree a037bc32da22cbd6303e0b5cc3ca0bc7d7625aa2
parent 5eb09df38688476d797f63491397b6e08e0a32c4
parent ccf6cdbffd750fb0bd55f95b546dd9bdb34aa119

Merge "[KM-VM] Add rollback index to KM VM AVB footer" into main am: ccf6cdbffd

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3350826

Change-Id: Ic39222c6f236805ee6b77e0bbe2b531fea1a733f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

guest/trusty/security_vm/launcher/Android.bp

diff --git a/guest/trusty/security_vm/launcher/Android.bp b/guest/trusty/security_vm/launcher/Android.bp
index e482e02..ef32740 100644
--- a/guest/trusty/security_vm/launcher/Android.bp
+++ b/guest/trusty/security_vm/launcher/Android.bp
@@ -40,12 +40,15 @@
 // python -c "import hashlib; print(hashlib.sha256(b'trusty_security_vm_salt').hexdigest())"
 trusty_security_vm_salt = "75a71e967c1a1e0f805cca20465e7acf83e6a04e567a67c426d8b5a94f8d61c5"
 
+TRUSTY_SECURITY_VM_VERSION = 1
+
 avb_add_hash_footer {
     name: "trusty_security_vm_signed",
     filename: "trusty_security_vm_signed",
     partition_name: "boot",
     private_key: ":trusty_vm_sign_key",
     salt: trusty_security_vm_salt,
+    rollback_index: TRUSTY_SECURITY_VM_VERSION,
     src: ":empty_file",
     enabled: false,
     arch: {