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

Commit 7184a231 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Automerger Merge Worker
Browse files

Merge "Use bootstrap linkerconfig from early init" am: 2f3e936f 

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

Change-Id: I2c43dd431947c080d26957bec876902180868a23
parents d62cc3a9 2f3e936f

init/builtins.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1232,7 +1232,7 @@ static Result<void> do_mark_post_data(const BuiltinArguments& args) { 
}



static Result<void> GenerateLinkerConfiguration() {

    const char* linkerconfig_binary = "/system/bin/linkerconfig";

    const char* linkerconfig_binary = "/apex/com.android.runtime/bin/linkerconfig";

    const char* linkerconfig_target = "/linkerconfig";

    const char* arguments[] = {linkerconfig_binary, "--target", linkerconfig_target};

rootdir/init.rc

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ on early-init 
    write /sys/module/dm_verity/parameters/prefetch_cluster 0



    # Generate ld.config.txt for early executed processes

    exec -- /system/bin/linkerconfig --target /linkerconfig/bootstrap

    exec -- /system/bin/bootstrap/linkerconfig --target /linkerconfig/bootstrap

    chmod 644 /linkerconfig/bootstrap/ld.config.txt

    copy /linkerconfig/bootstrap/ld.config.txt /linkerconfig/default/ld.config.txt

    chmod 644 /linkerconfig/default/ld.config.txt