From 8d70eb617ea2260ba7338169a61f7aa4f5269f61 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Tue, 12 Nov 2019 09:57:29 -0500
Subject: ldconfig: add /sbin to search.paths

- Move commands from prebuilt to root Android.mk
- Hotfix for linker errors after https://git.io/JerWD merge
  on some Samsung device(s)

Change-Id: If628ab486689878885b696c2f5a107987092aeba
---
 Android.mk          | 13 +++++++++++++
 prebuilt/Android.mk |  1 -
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 7ffcd70aa..d0d962f54 100755
--- a/Android.mk
+++ b/Android.mk
@@ -515,6 +515,19 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
 endif
 endif
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26; echo $$?),0)
+    TWRP_REQUIRED_MODULES += ld.config.txt
+    ifeq ($(BOARD_VNDK_RUNTIME_DISABLE),true)
+        LOCAL_POST_INSTALL_CMD += \
+            sed '0,/^namespace.default.search.paths\s\{1,\}/!b;//a\namespace.default.search.paths += \/sbin' \
+                $(TARGET_OUT_ETC)/ld.config.vndk_lite.txt > $(TARGET_RECOVERY_ROOT_OUT)/sbin/ld.config.txt;
+    else
+        LOCAL_POST_INSTALL_CMD += \
+            sed '0,/^namespace.default.search.paths\s\{1,\}/!b;//a\namespace.default.search.paths += \/sbin' \
+                $(TARGET_OUT_ETC)/ld.config.txt > $(TARGET_RECOVERY_ROOT_OUT)/sbin/ld.config.txt;
+    endif
+endif
+
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 25; echo $$?),0)
     TWRP_REQUIRED_MODULES += file_contexts_text
 endif
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 4640d03d0..d33079994 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -370,7 +370,6 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0)
     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
-- 
cgit v1.2.3