commit d7da915ee277cb24c0042f968da7a9974daeb76d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Feb 12 03:30:11 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 12 03:30:11 2025 -0800
tree f8772b201d0e75de99958611cecc946daf01e07f
parent d904c323ac07e60729b3b86a44f76de27c2aff9f
parent 65ab14cc1261449e3b8b5635dbc8777e2a4f5697

Merge "guest: trusty: security_vm: vm: fix the removal of static_libs" into main

libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachineConfig.java

diff --git a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachineConfig.java b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachineConfig.java
index 83b234d..2668ca2 100644
--- a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachineConfig.java
+++ b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachineConfig.java
@@ -42,6 +42,7 @@
 import android.sysprop.HypervisorProperties;
 import android.system.virtualizationservice.AssignedDevices;
 import android.system.virtualizationservice.CpuOptions;
+import android.system.virtualizationservice.CustomMemoryBackingFile;
 import android.system.virtualizationservice.DiskImage;
 import android.system.virtualizationservice.Partition;
 import android.system.virtualizationservice.SharedPath;
@@ -835,6 +836,7 @@
                                 })
                         .orElse(null);
         config.teeServices = EMPTY_STRING_ARRAY;
+        config.customMemoryBackingFiles = new CustomMemoryBackingFile[0];
         return config;
     }