commit 03b9bcabff765ea9a5ca71bf51de314960e4c1db
author Kiyoung Kim <kiyoungkim@google.com> Mon Nov 30 14:49:36 2020 +0900
committer Kiyoung Kim <kiyoungkim@google.com> Wed Dec 02 11:41:06 2020 +0900
tree 67eed991fe2183652fadbfa9127840f33dee2826
parent e11663f483547501bb02234d671cab60484dded4

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

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index b235d2f..c44e03e 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -1232,7 +1232,7 @@
 }
 
 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};