Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28ef6ba5 authored by Alice Wang's avatar Alice Wang Committed by Automerger Merge Worker
Browse files

Merge "Rename KM VM related system properties" into main am: abe7640a 

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



Change-Id: I4545e34e598a35726c24ed4b6881ceaeb0e67486
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e770a9e abe7640a

trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc

+2 −2
Original line number Diff line number Diff line
@@ -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:trusty_vm_system.vm_cid=*

    setprop system.keymint.trusty_ipc_dev VSOCK:${trusty_vm_system.vm_cid}:1

   property:trusty.security_vm.vm_cid=*

    setprop system.keymint.trusty_ipc_dev VSOCK:${trusty.security_vm.vm_cid}:1

    start system.keymint.rust-trusty.nonsecure

trusty/utils/rpmb_dev/rpmb_dev.system.rc

+5 −5
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ service rpmb_mock_system /system_ext/bin/rpmb_dev.system \ 


# storageproxyd

on late-fs && \

    property:trusty_vm_system_nonsecure.ready=1 && \

    property:trusty.security_vm.nonsecure_vm_ready=1 && \

    property:storageproxyd_system.trusty_ipc_dev=*

    wait /dev/socket/rpmb_mock_system

    start storageproxyd_system
@@ -32,8 +32,8 @@ on late-fs && \ 


# RPMB Mock

on post-fs && \

    property:trusty_vm_system_nonsecure.ready=1 && \

    property:trusty_vm_system.vm_cid=*

    property:trusty.security_vm.nonsecure_vm_ready=1 && \

    property:trusty.security_vm.vm_cid=*

    # Create a persistent location for the RPMB data

    # (work around lack of RPMb block device on CF).

    # file contexts secure_storage_rpmb_system_file
@@ -49,12 +49,12 @@ on post-fs && \ 
    mkdir /mnt/secure_storage_persist_system 0770 system system

    symlink /metadata/secure_storage_persist_system \

            /mnt/secure_storage_persist_system/persist

    setprop storageproxyd_system.trusty_ipc_dev VSOCK:${trusty_vm_system.vm_cid}:1

    setprop storageproxyd_system.trusty_ipc_dev VSOCK:${trusty.security_vm.vm_cid}:1

    exec_start rpmb_mock_init_system

    start rpmb_mock_system



on post-fs-data && \

    property:trusty_vm_system_nonsecure.ready=1 && \

    property:trusty.security_vm.nonsecure_vm_ready=1 && \

    property:storageproxyd_system.trusty_ipc_dev=*

    # file contexts secure_storage_system_file

    mkdir /data/secure_storage_system 0770 root system