commit 63998043531eb2fa7ed0a2027dfe3d2bc239cdcf
author Armelle Laine <armellel@google.com> Mon Mar 03 05:21:53 2025 +0000
committer Armelle Laine <armellel@google.com> Mon Mar 03 01:21:57 2025 -0800
tree 3dceb388898af6744346d9c4424c7050560dcf8c
parent 3d36041050125298be1735da06b6bde7a929d5a9

trusty: utils: rpmb_dev: rpmb_dev.test.system.rc: support test_vm_os

Bug: 400066193
Test: atest TrustyVMUnitTests
Change-Id: I852c9d161c0cc01c096167145d90f66ff4b6fd8a

trusty/utils/rpmb_dev/rpmb_dev.test.system.rc

diff --git a/trusty/utils/rpmb_dev/rpmb_dev.test.system.rc b/trusty/utils/rpmb_dev/rpmb_dev.test.system.rc
index 2127798..c85dd12 100644
--- a/trusty/utils/rpmb_dev/rpmb_dev.test.system.rc
+++ b/trusty/utils/rpmb_dev/rpmb_dev.test.system.rc
@@ -1,11 +1,15 @@
-service trusty_test_vm /apex/com.android.virt/bin/vm run \
-    /data/local/tmp/TrustyTestVM_UnitTests/trusty-test_vm-config.json
+service storageproxyd_test_vm /system_ext/bin/storageproxyd.system \
+        -d VSOCK:${trusty.test_vm.vm_cid}:1 \
+        -r /dev/socket/rpmb_mock_test_system \
+        -p /data/secure_storage_test_system \
+        -t sock
     disabled
+    class hal
     user system
     group system
 
-service storageproxyd_test_system /system_ext/bin/storageproxyd.system \
-        -d VSOCK:${trusty.test_vm.vm_cid}:1 \
+service storageproxyd_test_vm_os /system_ext/bin/storageproxyd.system \
+        -d VSOCK:${trusty.test_vm_os.vm_cid}:1 \
         -r /dev/socket/rpmb_mock_test_system \
         -p /data/secure_storage_test_system \
         -t sock