Merge "Exec_start derive_classpath on post-fs-data." am: 294167d436 am: 5a9cc5be96 am: d42c33e586
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1602393
Change-Id: Ifd306f2bb2c5f56eac97aec22d5c11a885040c4f
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 58e161d..5612fa5 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -884,9 +884,12 @@
wait_for_prop apexd.status activated
perform_apex_config
- # Export *CLASSPATH variables from /etc/classpath
- # TODO(b/180105615): export from the generated file instead.
- load_exports /etc/classpath
+ # 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
# Special-case /data/media/obb per b/64566063
mkdir /data/media 0770 media_rw media_rw encryption=None
@@ -902,6 +905,7 @@
# 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