Merge "Do not execute linkerconfig from recovery"

am: b12e54c4f1 Change-Id: Ica8a524984cc85a05c23a03133693586cb7e4f80
2019-12-17 17:01:34 -08:00
parent 305417d49e b12e54c4f1
commit 7a0a80ea28
1 changed files with 2 additions and 2 deletions
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -4,8 +4,8 @@ on early-init
    # Set the security context of /postinstall if present.
    restorecon /postinstall

-    # Generate ld.config.txt for recovery processes
-    exec u:r:linkerconfig:s0 -- /system/bin/linkerconfig --target /linkerconfig/ld.config.txt
+    # Copy prebuilt ld.config.txt into linkerconfig directory
+    copy /system/etc/ld.config.txt /linkerconfig/ld.config.txt
    chmod 444 /linkerconfig/ld.config.txt

    start ueventd