commit af300dcf9af116c9501943ec0670d6906e8768d0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Mar 19 10:53:25 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 19 10:53:25 2025 -0700
tree 912a82ef0020e704a2cb1f958f3f81874211e3b8
parent 3cfd401c77a59fe71bc25b87f85bc6b5415a86d3
parent 74b2103cf27150f1bbd6e245288530e52376a327

Merge "Allow override of the trusty system vm packages" into main

guest/trusty/security_vm/security_vm.mk

diff --git a/guest/trusty/security_vm/security_vm.mk b/guest/trusty/security_vm/security_vm.mk
index 89c9cdc..8717399 100644
--- a/guest/trusty/security_vm/security_vm.mk
+++ b/guest/trusty/security_vm/security_vm.mk
@@ -14,10 +14,14 @@
 
 
 ifeq ($(findstring enabled, $(TRUSTY_SYSTEM_VM)),enabled)
-PRODUCT_PACKAGES += \
-	trusty_security_vm.elf \
+
+# This is the default set of packages to load the trusty system vm.
+# It can be overridden by device-specific configuration.
+TRUSTY_SYSTEM_VM_PRODUCT_PACKAGES ?= trusty_security_vm.elf \
 	trusty_security_vm_launcher \
 	trusty_security_vm_launcher.rc \
 	early_vms.xml \
 
+PRODUCT_PACKAGES += $(TRUSTY_SYSTEM_VM_PRODUCT_PACKAGES)
+
 endif