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

Commit 31cf6c54 authored by satayev's avatar satayev Committed by Automerger Merge Worker
Browse files

Merge "Delay running derive_classpath." am: f6b2b201 am: a41cae9c am: 2ad6b60f am: f2fdf1b8 

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

Change-Id: Ice2bdb7ef0e6d7ed2ed92e190bf8c7150cf28ffb
parents 848c5ea2 f2fdf1b8

rootdir/init.rc

+6 −6
Original line number Diff line number Diff line
@@ -887,12 +887,6 @@ on post-fs-data 
    wait_for_prop apexd.status activated

    perform_apex_config



    # Define and export *CLASSPATH variables

    # 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

    exec - media_rw media_rw -- /system/bin/chattr +F /data/media
@@ -905,6 +899,12 @@ on post-fs-data 
    # Set SELinux security contexts on upgrade or policy update.

    restorecon --recursive --skip-ce /data



    # Define and export *CLASSPATH variables

    # 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



    # 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.