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

Commit 4f6c9484 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "trusty: utils: rpmb_dev: secure storage support for test VM" into main am: 63051ccd 

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



Change-Id: Ic6ae4769ad553b5be19413661919fb79e2a5ad22
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54fcd052 63051ccd

trusty/trusty-storage-cf.mk

+1 −0
Original line number Diff line number Diff line
@@ -22,4 +22,5 @@ 
PRODUCT_PACKAGES += \

	storageproxyd.system \

	rpmb_dev.system \

	rpmb_dev.test.system \

trusty/utils/rpmb_dev/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -58,3 +58,12 @@ cc_binary { 
        "rpmb_dev.wv.system.rc",

    ],

}



cc_binary {

    name: "rpmb_dev.test.system",

    defaults: ["rpmb_dev.cc_defaults"],

    system_ext_specific: true,

    init_rc: [

        "rpmb_dev.test.system.rc",

    ],

}

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

0 → 100644
+56 −0
Original line number Diff line number Diff line 
service trusty_test_vm /apex/com.android.virt/bin/vm run \

    /data/local/tmp/TrustyTestVM_UnitTests/trusty-test_vm-config.json

    disabled

    user system

    group system



service storageproxyd_test_system /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 rpmb_mock_init_test_system /system_ext/bin/rpmb_dev.test.system \

        --dev /mnt/secure_storage_rpmb_test_system/persist/RPMB_DATA --init --size 2048

    disabled

    user system

    group system

    oneshot



service rpmb_mock_test_system /system_ext/bin/rpmb_dev.test.system \

        --dev /mnt/secure_storage_rpmb_test_system/persist/RPMB_DATA \

        --sock rpmb_mock_test_system

    disabled

    user system

    group system

    socket rpmb_mock_test_system stream 660 system system



# RPMB Mock

on post-fs-data

    # Create a persistent location for the RPMB data

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

    # file contexts secure_storage_rpmb_system_file

    # (only used on Cuttlefish as this is non secure)

    mkdir /metadata/secure_storage_rpmb_test_system 0770 system system

    mkdir /mnt/secure_storage_rpmb_test_system 0770 system system

    symlink /metadata/secure_storage_rpmb_test_system \

            /mnt/secure_storage_rpmb_test_system/persist

    # Create a system persist directory in /metadata

    # (work around lack of dedicated system persist partition).

    # file contexts secure_storage_persist_system_file

    mkdir /metadata/secure_storage_persist_test_system 0770 system system

    mkdir /mnt/secure_storage_persist_test_system 0770 system system

    symlink /metadata/secure_storage_persist_test_system \

            /mnt/secure_storage_persist_test_system/persist

    # file contexts secure_storage_system_file

    mkdir /data/secure_storage_test_system 0770 root system

    symlink /mnt/secure_storage_persist_test_system/persist \

            /data/secure_storage_test_system/persist

    chown root system /data/secure_storage_test_system/persist

    # setprop storageproxyd_test_system.trusty_ipc_dev VSOCK:${trusty.test_vm.vm_cid}:1

    exec_start rpmb_mock_init_test_system

    start rpmb_mock_test_system