| commit | 655a03f7c2126e34fb7854840ade17a0380adb69 | [log] [tgz] |
|---|---|---|
| author | Martin Stjernholm <mast@google.com> | Mon May 15 19:29:00 2023 +0000 |
| committer | Martin Stjernholm <mast@google.com> | Mon May 15 20:09:34 2023 +0000 |
| tree | 8fb7ae0e35ab420161d2a7dc9d7fdcc92bce0e47 | |
| parent | 90bbf8253f72e811d495f7659e6e4b9b368ccc08 [diff] [blame] |
Run art_boot before odsign. It's necessary to have the right dalvik.vm.* flags in place when they are validated by odrefresh. Test: See the other CL in the topic. Bug: 281850017 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7c9c8f52e75daf30ae0cc6130c321769a23e320d) Merged-In: Ib64790dde97faaa6b62ead2c1c8dd53c97f97f9c Change-Id: Ib64790dde97faaa6b62ead2c1c8dd53c97f97f9c
diff --git a/rootdir/init.rc b/rootdir/init.rc index d755b50..fdad273 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc
@@ -1004,6 +1004,11 @@ exec_start derive_classpath load_exports /data/system/environ/classpath + # Start ART's oneshot boot service to propagate boot experiment flags to + # dalvik.vm.*. This needs to be done before odsign since odrefresh uses and + # validates those properties against the signed cache-info.xml. + exec_start art_boot + # Start the on-device signing daemon, and wait for it to finish, to ensure # ART artifacts are generated if needed. # Must start after 'derive_classpath' to have *CLASSPATH variables set.