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

Commit 1320668c authored by Artur Satayev's avatar Artur Satayev
Browse files

Exec_start derive_classpath on post-fs-data. 

The service parses and merges configs from multiple partitions, defines
*CLASSPATH environ variables' values and writes them to file, for
init to export.

See go/updatable-classpath for more details.

Bug: 180105615
Test: manual
Change-Id: I60c539a8fef4d690f47704e896f67949ec49db60
parent 72ad5d29

rootdir/init.rc

+7 −3
Original line number Diff line number Diff line
@@ -881,9 +881,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
@@ -899,6 +902,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.

    exec_start odsign



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