diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2020-11-30 14:49:36 +0900 |
|---|---|---|
| committer | Kiyoung Kim <kiyoungkim@google.com> | 2020-12-02 11:41:06 +0900 |
| commit | 03b9bcabff765ea9a5ca71bf51de314960e4c1db (patch) | |
| tree | 67eed991fe2183652fadbfa9127840f33dee2826 | |
| parent | e11663f483547501bb02234d671cab60484dded4 (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
| -rw-r--r-- | init/builtins.cpp | 2 | ||||
| -rw-r--r-- | rootdir/init.rc | 2 |
2 files changed, 2 insertions, 2 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}; diff --git a/rootdir/init.rc b/rootdir/init.rc index 52ba9210f..240465cc4 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -56,7 +56,7 @@ on early-init 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 |