commit 8c0bcc8ba0d43cf3c88c9b63b10994a262ec125e
author big biff <bigbiff@teamw.in> Fri Nov 08 00:47:20 2019 +0100
committer Gerrit Code Review <gerrit2@gerrit.omnirom.org> Fri Nov 08 00:47:20 2019 +0100
tree f28bcbcfde1d1ab628927dab22d55f5f4cd1e416
parent a895118a1fb88595d41c7e29b079d9f3c547258c
parent 170964d5bb96964efa16abab3469106b95a9fa64

Merge "Add ld.config.txt for Android 8.x+ trees" into android-9.0

etc/Android.mk

diff --git a/etc/Android.mk b/etc/Android.mk
index 4aeb251..ca549ea 100644
--- a/etc/Android.mk
+++ b/etc/Android.mk
@@ -60,6 +60,15 @@
 
     LOCAL_SRC_FILES := init.recovery.hlthchrg26.rc
     include $(BUILD_PREBUILT)
+
+    include $(CLEAR_VARS)
+    LOCAL_MODULE := init.recovery.ldconfig.rc
+    LOCAL_MODULE_TAGS := eng
+    LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
+    LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+
+    LOCAL_SRC_FILES := init.recovery.ldconfig.rc
+    include $(BUILD_PREBUILT)
 else
     include $(CLEAR_VARS)
     LOCAL_MODULE := init.recovery.hlthchrg.rc

etc/init.rc

diff --git a/etc/init.rc b/etc/init.rc
index 348471d..e0889c4 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -1,4 +1,5 @@
 import /init.recovery.logd.rc
+import /init.recovery.ldconfig.rc
 import /init.recovery.mksh.rc
 import /init.recovery.usb.rc
 import /init.recovery.service.rc

etc/init.recovery.ldconfig.rc

diff --git a/etc/init.recovery.ldconfig.rc b/etc/init.recovery.ldconfig.rc
new file mode 100755
index 0000000..ad9c296
--- /dev/null
+++ b/etc/init.recovery.ldconfig.rc
@@ -0,0 +1,2 @@
+on fs
+    export LD_CONFIG_FILE /sbin/ld.config.txt

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index d330799..4640d03 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -370,6 +370,7 @@
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libvintf.so
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libtinyxml2.so
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hidl.token@1.0.so
+    RELINK_SOURCE_FILES += $(TARGET_OUT_ETC)/ld.config.txt
     ifneq ($(wildcard system/core/libkeyutils/Android.bp),)
         RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeyutils.so
     endif