commit 052a863342b616e7bf498452c821287ebd83bfaf
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 18 01:28:29 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 18 01:28:29 2019 +0000
tree 3748263e721b554d37f7e1cd8dc14ef4982a84de
parent a6418625c648f973833d5f1568ae15a9e188cc02
parent 0c6c04c64d18374d32c8686134540bd81b34304f

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

Change-Id: I434a509b4843b991f3a3abebac1a0a9fe8adfbe5

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