commit 0c6c04c64d18374d32c8686134540bd81b34304f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 18 01:13:39 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 18 01:13:39 2019 +0000
tree 7c6699d1427f4e85f03cc3b2f5af6d5a17fc43b9
parent 802e7bfd76f6702e3f779fc82ecda41c3019b3f3
parent 7a0a80ea28f9070251fcdf84d87f187582d485aa

Merge "Do not execute linkerconfig from recovery" am: b12e54c4f1 am: 7a0a80ea28

Change-Id: I60d2cfb4dc83c35820457f4f1b7646a01acf4edd

etc/init.rc

diff --git a/etc/init.rc b/etc/init.rc
index 395e627..3ec45db 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -4,8 +4,8 @@
     # 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