tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: I2c43dd431947c080d26957bec876902180868a23
This commit is contained in:
Kiyoung Kim 2020-12-04 01:36:50 +00:00 committed by Automerger Merge Worker
commit 7184a231cd
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
init/builtins.cpp
View file

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

2
rootdir/init.rc
View file

@ -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