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

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 52ba921..240465c 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