diff options
| author | Captain Throwback <captainthrowback@hotmail.com> | 2019-11-12 15:57:29 +0100 |
|---|---|---|
| committer | Captain Throwback <captainthrowback@hotmail.com> | 2019-11-14 17:14:06 +0100 |
| commit | 8d70eb617ea2260ba7338169a61f7aa4f5269f61 (patch) | |
| tree | b5ccbdad90013571469cddb6505f57ab717f0d4d | |
| parent | Merge "Add ld.config.txt for Android 8.x+ trees" into android-9.0 (diff) | |
| download | android_bootable_recovery-8d70eb617ea2260ba7338169a61f7aa4f5269f61.tar android_bootable_recovery-8d70eb617ea2260ba7338169a61f7aa4f5269f61.tar.gz android_bootable_recovery-8d70eb617ea2260ba7338169a61f7aa4f5269f61.tar.bz2 android_bootable_recovery-8d70eb617ea2260ba7338169a61f7aa4f5269f61.tar.lz android_bootable_recovery-8d70eb617ea2260ba7338169a61f7aa4f5269f61.tar.xz android_bootable_recovery-8d70eb617ea2260ba7338169a61f7aa4f5269f61.tar.zst android_bootable_recovery-8d70eb617ea2260ba7338169a61f7aa4f5269f61.zip | |
| -rwxr-xr-x | Android.mk | 13 | ||||
| -rw-r--r-- | prebuilt/Android.mk | 1 |
2 files changed, 13 insertions, 1 deletions
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 |