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

Commit 5dc67d4b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove fsverity_init reference from init" into main am: ea5715c1 

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



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

rootdir/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,6 @@ prebuilt_etc { 
    src: "init.rc",

    src: "init.rc",

    sub_dir: "init/hw",

    sub_dir: "init/hw",

    required: [

    required: [

        "fsverity_init",

        "platform-bootclasspath",

        "platform-bootclasspath",

        "init.boringssl.zygote64.rc",

        "init.boringssl.zygote64.rc",

        "init.boringssl.zygote64_32.rc",

        "init.boringssl.zygote64_32.rc",

rootdir/init.rc

+0 −3
Original line number Original line Diff line number Diff line
@@ -620,9 +620,6 @@ on late-fs 
    # HALs required before storage encryption can get unlocked (FBE)

    # HALs required before storage encryption can get unlocked (FBE)

    class_start early_hal

    class_start early_hal





    # Load trusted keys from dm-verity protected partitions

    exec -- /system/bin/fsverity_init --load-verified-keys



# Only enable the bootreceiver tracing instance for kernels 5.10 and above.

# Only enable the bootreceiver tracing instance for kernels 5.10 and above.

on late-fs && property:ro.kernel.version=4.19

on late-fs && property:ro.kernel.version=4.19

    setprop bootreceiver.enable 0

    setprop bootreceiver.enable 0