From 2ea6ecf71d74ea1c7acf4e24f349113ec6cdba68 Mon Sep 17 00:00:00 2001 From: Armelle Laine Date: Thu, 19 Sep 2024 07:48:33 +0000 Subject: [PATCH] trusty: keymint: rename trusty_ipc_dev property matching the naming convention for a system service property Bug: 309007107 Test: launch_cvd --noresume --console=true \ --extra_kernel_cmdline='androidboot.selinux=permissive' \ --secure_hals=guest_keymint_trusty_insecure Change-Id: I7c31f36dcac49d60469de44ce75c9b46a333786e --- ...security.keymint-service.rust.trusty.system.nonsecure.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc b/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc index 318c13b45..2799188c4 100644 --- a/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc +++ b/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc @@ -1,6 +1,6 @@ service system.keymint.rust-trusty.nonsecure \ /system_ext/bin/hw/android.hardware.security.keymint-service.rust.trusty.system.nonsecure \ - --dev ${ro.hardware.trusty_ipc_dev.keymint:-/dev/trusty-ipc-dev0} + --dev ${system.keymint.trusty_ipc_dev:-/dev/trusty-ipc-dev0} disabled user nobody group drmrpc @@ -12,6 +12,6 @@ service system.keymint.rust-trusty.nonsecure \ # TODO(b/357821690): Start the KeyMint HALs when the KeyMint VM is ready once the Trusty VM # has a mechanism to notify the host. on late-fs && property:ro.hardware.security.keymint.trusty.system=1 && \ - property:ro.hardware.trusty_vm_cid=* - setprop ro.hardware.trusty_ipc_dev.keymint VSOCK:${ro.hardware.trusty_vm_cid}:1 + property:trusty_vm_system.vm_cid=* + setprop system.keymint.trusty_ipc_dev VSOCK:${trusty_vm_system.vm_cid}:1 start system.keymint.rust-trusty.nonsecure