commit ee0acacaf0db2843b7c1d2f3b9e1721dc044af9f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Mar 03 04:55:19 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 03 04:55:19 2025 -0800
tree 3a2ea73545aa26c8f5246eaa27d8aa1197320ecf
parent a7c1bde79235c21782f5ce8afd076d2dd3b6ede1
parent c7321a8d3fdf836539f3d836eec8c32fc351834b

Merge "trusty: utils: rpmb_dev: rpmb_dev.test.system.rc: support test_vm_os" into main am: c7321a8d3f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3517565

Change-Id: I32383c035e1c1f16c89b1c187ade426712c34e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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