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

Commit 24ccfc24 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Gerrit Code Review
Browse files

Merge "Update linkerconfig to target out directory"

parents 81fbcbdb 3b2dbe9d

init/builtins.cpp

+1 −6
Original line number Diff line number Diff line
@@ -1179,7 +1179,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_target = "/linkerconfig/ld.config.txt";

    const char* linkerconfig_target = "/linkerconfig";

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



    if (logwrap_fork_execvp(arraysize(arguments), arguments, nullptr, false, LOG_KLOG, false,
@@ -1187,11 +1187,6 @@ static Result<void> GenerateLinkerConfiguration() { 
        return ErrnoError() << "failed to execute linkerconfig";

    }



    mode_t mode = get_mode("0444");

    if (fchmodat(AT_FDCWD, linkerconfig_target, mode, AT_SYMLINK_NOFOLLOW) < 0) {

        return ErrnoErrorIgnoreEnoent() << "fchmodat() failed";

    }



    LOG(INFO) << "linkerconfig generated " << linkerconfig_target

              << " with mounted APEX modules info";

rootdir/init.rc

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ on early-init 
    mkdir /linkerconfig/default 0755



    # Generate ld.config.txt for early executed processes

    exec -- /system/bin/linkerconfig --target /linkerconfig/bootstrap/ld.config.txt

    exec -- /system/bin/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