| commit | fc10e3f8838477e9ce8de8b7aae2204c7608e0dc | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Wed Jun 24 03:10:33 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 24 03:10:33 2020 +0000 |
| tree | 0aac7ebee14f35460a9a2a467f8117e7607fcf44 | |
| parent | cc37c07a8b549a09c57f9a838b9ca6d73d9f6fdb [diff] | |
| parent | d9299c5119606fa4d2cc3a2483bd2e75201201e6 [diff] |
Merge "add a new trigger for launching the bpfloader" am: d9299c5119 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1345185 Change-Id: I9669ff9795fc78b006101030e6ba10f40d4d8b63
diff --git a/rootdir/init.rc b/rootdir/init.rc index 01551e2..226bcf4 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc
@@ -445,6 +445,9 @@ # Load persist properties and override properties (if enabled) from /data. trigger load_persist_props_action + # Should be before netd, but after apex, properties and logging is available. + trigger load_bpf_programs + # Now we can start zygote for devices with file based encryption trigger zygote-start