commit 7a0a80ea28f9070251fcdf84d87f187582d485aa
author Kiyoung Kim <kiyoungkim@google.com> Tue Dec 17 17:01:34 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Dec 17 17:01:34 2019 -0800
tree 7c6699d1427f4e85f03cc3b2f5af6d5a17fc43b9
parent 305417d49eb0aa020d9070a934b041e1564a6483
parent b12e54c4f151d0c632ecea26d04c745d427aca06

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

Change-Id: Ica8a524984cc85a05c23a03133693586cb7e4f80

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