Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56df3641 authored by satayev's avatar satayev Committed by Automerger Merge Worker
Browse files

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

Merge "Revert^2 "Exec_start derive_classpath on post-fs-data."" am: baf2168d am: 45b9ab2f am: f4b313b7 am: ebe78e60

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1645674

Change-Id: I738f335781ec3f0ea4977bd994527604cd0dd2f1
parents 109b0290 ebe78e60

rootdir/init.rc

+7 −3
Original line number Diff line number Diff line
@@ -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