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

Commit b56f8d2b authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

Merge "Revert "Exec_start derive_classpath on post-fs-data."" am: 8de8eb74... 

Merge "Revert "Exec_start derive_classpath on post-fs-data."" am: 8de8eb74 am: defe4652 am: eb3e0be4

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

Change-Id: I306f061229b1252c0b5e051552bef79995c03610
parents 04fa5af6 eb3e0be4

rootdir/init.rc

+3 −7
Original line number Diff line number Diff line
@@ -884,12 +884,9 @@ on post-fs-data 
    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 @@ 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.

    exec_start odsign



    # After apexes are mounted, tell keymaster early boot has ended, so it will