summaryrefslogtreecommitdiff
path: root/init/builtins.cpp
diff options
context:
space:
mode:
authorKiyoung Kim <kiyoungkim@google.com>2020-11-30 14:49:36 +0900
committerKiyoung Kim <kiyoungkim@google.com>2020-12-02 11:41:06 +0900
commit03b9bcabff765ea9a5ca71bf51de314960e4c1db (patch)
tree67eed991fe2183652fadbfa9127840f33dee2826 /init/builtins.cpp
parente11663f483547501bb02234d671cab60484dded4 (diff)
Use bootstrap linkerconfig from early init
Linkerconfig will be moved into Runtime APEX, so /system/bin/linkerconfig would not be available before APEX is mounted. Use bootstrap linkerconfig instead during early init. Bug: 165769179 Test: Cuttlefish boot succeeded Change-Id: Iae41f325bbd5f5194aaf4613141860f913dfbff1
Diffstat (limited to 'init/builtins.cpp')
-rw-r--r--init/builtins.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp
index b235d2f09..c44e03ed7 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -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};