diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2019-12-30 18:44:41 +0900 |
|---|---|---|
| committer | Kiyoung Kim <kiyoungkim@google.com> | 2019-12-30 18:44:41 +0900 |
| commit | a7be4085d93e6a53cff148deb42daff0dc3211f4 (patch) | |
| tree | c358a4b8059085c8cd171ba26971d4ad257de7b8 /init/builtins.cpp | |
| parent | 037739b75edeb0419a1e8210a9f57b3ab9ca0b53 (diff) | |
Update linkerconfig to target out directory
Current linkerconfig targets for specific output file. However,
linkerconfig will generate more than 1 file based on APEX modules, so it
should take argument for target directory rather than target file. This
change updates linkerconfig's argument to point output directory.
Bug: 146993126
Test: m -j passed & Cuttlefish succeeded to boot
Change-Id: I3a720a047077688582436aabd307adafeafc5398
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 3c32d8ba2a..64d9c59076 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"; |