| commit | 13c548bb83df3f6128249866bbe38f630ecee0d8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Mar 04 09:57:35 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 04 09:57:35 2025 -0800 |
| tree | 5132774b198325245a7d2402b4b24e2d100e6d70 | |
| parent | cf3e068a864b5e578fe333900d803ec49a92c55f [diff] | |
| parent | 5b12635d40df1760364e387fe4cc6baca9776af4 [diff] |
Merge "guest: trusty: security_vm: launcher: enable protected VM" into main am: eb47f08615 am: 5b12635d40 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3519293 Change-Id: I5673923cc9f6472d1ee78a960ba04352491806e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/guest/trusty/security_vm/launcher/security_vm_launcher-arm64.rc b/guest/trusty/security_vm/launcher/security_vm_launcher-arm64.rc index c0e0537..b9c7147 100644 --- a/guest/trusty/security_vm/launcher/security_vm_launcher-arm64.rc +++ b/guest/trusty/security_vm/launcher/security_vm_launcher-arm64.rc
@@ -1,9 +1,9 @@ -# TODO(b/393848713): use --protected for the vm launcher when issues are fixed # TODO(b/393848753): determine whether task_profiles shall be defined service trusty_security_vm_launcher /system_ext/bin/trusty_security_vm_launcher \ --name trusty_security_vm_launcher \ --kernel /system_ext/etc/vm/trusty_vm/trusty_security_vm.elf \ ---memory-size-mib 32 +--memory-size-mib 32 \ +--protected disabled user system group system virtualmachine