diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2020-01-01 20:20:08 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2020-01-01 20:20:08 -0800 |
| commit | 3dfaad538f2fc2fdeb2f1abcfc210051cc17baad (patch) | |
| tree | 4ba41d6966b14f9860f6fd07c6e02ee28f7a2620 | |
| parent | 5924eeb4a465bddf9ae6b4bfbae7acbc7e8529f4 (diff) | |
| parent | 24ccfc244bdaffd911fed13903a467dfad9ff651 (diff) | |
| download | core-3dfaad538f2fc2fdeb2f1abcfc210051cc17baad.tar.gz | |
Merge "Update linkerconfig to target out directory"
am: 24ccfc244b
Change-Id: I074b42411163b0aec47e7385ec8fbc3abbe33e87
| -rw-r--r-- | init/builtins.cpp | 7 | ||||
| -rw-r--r-- | rootdir/init.rc | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 3c32d8ba2..64d9c5907 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -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"; diff --git a/rootdir/init.rc b/rootdir/init.rc index 012bf50f8..7a3339d8f 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -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 |