From c630b3864f9ad0a7fe0b88b4180f42eefe3301db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20D=C3=BCnkelmann?= Date: Mon, 30 Dec 2019 15:19:03 +0100 Subject: [PATCH] Fix 'system/etc/ld.config.txt' not found error According to https://android.googlesource.com/platform/system/core/+/refs/tags/android-9.0.0_r51/rootdir/Android.mk#260 the ld.config.txt gets generated with the vndk version as a suffix. This behaviour exists since API level 28 (Android 9.0), if BOARD_VNDK_VERSION is defined and BOARD_VNDK_RUNTIME_DISABLE is not true. The issue seems to be exist since commit 8d70eb617ea2260ba7338169a61f7aa4f5269f61 in twrp. Change-Id: I19741c29cda65ce051b7c167a946d551ce149f7b --- Android.mk | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Android.mk b/Android.mk index 1bb421ab..31a697d8 100755 --- a/Android.mk +++ b/Android.mk @@ -517,15 +517,10 @@ 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 's/\(namespace.default.search.paths\)\s\{1,\}=/namespace.default.search.paths = \/sbin\n\1 +=/' \ - $(TARGET_OUT_ETC)/ld.config.vndk_lite.txt > $(TARGET_RECOVERY_ROOT_OUT)/sbin/ld.config.txt; - else - LOCAL_POST_INSTALL_CMD += \ - sed 's/\(namespace.default.search.paths\)\s\{1,\}=/namespace.default.search.paths = \/sbin\n\1 +=/' \ - $(TARGET_OUT_ETC)/ld.config.txt > $(TARGET_RECOVERY_ROOT_OUT)/sbin/ld.config.txt; - endif + TWRP_REQUIRED_MODULES += init.recovery.ldconfig.rc + LOCAL_POST_INSTALL_CMD += \ + sed 's/\(namespace.default.search.paths\)\s\{1,\}=/namespace.default.search.paths = \/sbin\n\1 +=/' \ + $(TARGET_OUT_ETC)/ld.config*.txt > $(TARGET_RECOVERY_ROOT_OUT)/sbin/ld.config.txt; endif ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 25; echo $$?),0)