commit ea5715c191c683fc70411a7bd56971ed1b8c033b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Dec 16 17:32:11 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 16 17:32:11 2024 -0800
tree 6b99d6f332cb1393d88fef94699044e5ca18eece
parent f51453c235a6e0f03ff279c31efc22cada12db1d
parent c4956b0e4ed9d5dc191fb279eeddc18e5d28189e

Merge "Remove fsverity_init reference from init" into main

rootdir/Android.bp

diff --git a/rootdir/Android.bp b/rootdir/Android.bp
index 121652c..3204a9f 100644
--- a/rootdir/Android.bp
+++ b/rootdir/Android.bp
@@ -37,7 +37,6 @@
     src: "init.rc",
     sub_dir: "init/hw",
     required: [
-        "fsverity_init",
         "platform-bootclasspath",
         "init.boringssl.zygote64.rc",
         "init.boringssl.zygote64_32.rc",

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 957860f..883ed9c 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -620,9 +620,6 @@
     # HALs required before storage encryption can get unlocked (FBE)
     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.
 on late-fs && property:ro.kernel.version=4.19
     setprop bootreceiver.enable 0