commit 7184a231cdb40ea94d87299e9ac8121b7a845017
author Kiyoung Kim <kiyoungkim@google.com> Fri Dec 04 01:36:50 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 04 01:36:50 2020 +0000
tree fd83fbd41a54d1824a1a1e37b2d8897538ca29d2
parent d62cc3a9f5255cf8c03de658eccf8a598bdf120b
parent 2f3e936f729079abea763d4edf78340865876c95

Merge "Use bootstrap linkerconfig from early init" am: 2f3e936f72

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1512740

Change-Id: I2c43dd431947c080d26957bec876902180868a23

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};
 

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 78679a3..2de066d 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -56,7 +56,7 @@
     write /sys/module/dm_verity/parameters/prefetch_cluster 0
 
     # Generate ld.config.txt for early executed processes
-    exec -- /system/bin/linkerconfig --target /linkerconfig/bootstrap
+    exec -- /system/bin/bootstrap/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