From 5cb78dc2807abe77a10adec70399519432061725 Mon Sep 17 00:00:00 2001 From: Captain Throwback Date: Tue, 22 Jan 2019 19:27:22 +0100 Subject: Revert "Fix ld.config.txt errors on Android 8.1 system root devices" This reverts commit 1ccdefab7926520dec4934bf4f3a1176cf5953f6. Reason for revert: Causes delay during boot resulting in failed decryption on FDE devices. Recommend having device maintainers specify this variable manually in rc file and include actual ld.config.txt (or placeholder) in ramdisk directly. Change-Id: Ib2410675396b38522d690c6057057d164cc0cff2 --- etc/init.recovery.service22.rc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/etc/init.recovery.service22.rc b/etc/init.recovery.service22.rc index 43a3374b4..bb2853c1a 100644 --- a/etc/init.recovery.service22.rc +++ b/etc/init.recovery.service22.rc @@ -1,11 +1,5 @@ on boot - export LD_CONFIG_FILE /sbin/ld.config.txt # For starting recovery on 5.0 and newer service recovery /sbin/recovery seclabel u:r:recovery:s0 - -# This helps fix ld.config.txt errors from the linker on Android 8.1 -service ldconfigtxt /sbin/touch /sbin/ld.config.txt - oneshot - seclabel u:r:recovery:s0 -- cgit v1.2.3