Merge "Revert "Exec_start derive_classpath on post-fs-data."" am: 8de8eb741b am: defe465229
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1645499
Change-Id: I2c0cae10cac08154c64a5ff17d76fce5250bb1de
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 6b8868b..11b3da7 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -884,12 +884,9 @@
wait_for_prop apexd.status activated
perform_apex_config
- # Define and export *CLASSPATH variables
- mkdir /data/system/environ 0700 system system
- # Must start before 'odsign', as odsign depends on *CLASSPATH variables
- exec_start derive_classpath
- load_exports /data/system/environ/classpath
- rm /data/system/environ/classpath
+ # Export *CLASSPATH variables from /etc/classpath
+ # TODO(b/180105615): export from the generated file instead.
+ load_exports /etc/classpath
# Special-case /data/media/obb per b/64566063
mkdir /data/media 0770 media_rw media_rw encryption=None
@@ -905,7 +902,6 @@
# 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.
exec_start odsign
# After apexes are mounted, tell keymaster early boot has ended, so it will