openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Revert^2 "Exec_start derive_classpath on post-fs-data.""

This commit is contained in:
satayev 2021-03-23 10:10:00 +00:00 committed by Gerrit Code Review
parent e37b6f4f67 52cc896997
commit baf2168da7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rootdir/init.rc
View File

@ -884,9 +884,12 @@ on post-fs-data
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 @@ on post-fs-data
# 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.
start odsign
# Before we can lock keys and proceed to the next boot stage, wait for