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

Commit 7df79970 authored by Artur Satayev's avatar Artur Satayev
Browse files

Delay running derive_classpath. 

It must run before odsign; and now runs after restorecon on /data as well.

Bug: 183861600
Bug: 180105615
Test: presubmit && cuttlefish boots
Change-Id: Iefe59d94a7a40ed1e526c189cbc2baf69156f334
parent 441e6b91

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.