diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-03 04:03:35 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-03 04:03:35 +0000 |
| commit | 452c5774022dfa2332475824fa6482068184b986 (patch) | |
| tree | 0ba004c112531d08758d79716a3c0f0bb3582435 /init/builtins.cpp | |
| parent | a91de8812c62ebcabaaf163d83d209460563bc63 (diff) | |
| parent | ea91986429a5f92e01643c60646b3c2e362843c9 (diff) | |
Snap for 6108108 from ea91986429a5f92e01643c60646b3c2e362843c9 to rvc-release
Change-Id: I04d855efa25a83428a49125cb3456a6b1266f57c
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 7 |
1 files changed, 1 insertions, 6 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"; |