| commit | 4ead100a632ee6be6e557d19066edaad25715df4 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Mar 19 11:23:47 2025 -0700 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 19 11:23:47 2025 -0700 |
| tree | 3fb70c35918bb3a702db5818eaf9f8a4358b3f96 | |
| parent | d85387cdfd6b64e47feff50e8a0f2094a39ce632 [diff] | |
| parent | 4642448de99d66ea97dce85fcd2243b57675fa90 [diff] |
Merge "Allow override of the trusty system vm packages" into main am: af300dcf9a am: 4642448de9 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3552239 Change-Id: Ibddd6332dc86c0e35c63f96d91a05ebc9cf01e91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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