diff options
| author | big biff <bigbiff@teamw.in> | 2019-12-01 01:22:18 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.omnirom.org> | 2019-12-01 01:22:18 +0100 |
| commit | 72d75b0b40221d5c079448d7b2ad04a15d1505da (patch) | |
| tree | f83f2a813fcabe445409d69abe087e84e66ec4c4 | |
| parent | Encryption: try wrapped key also for device without metadata support (diff) | |
| parent | ldconfig: add /sbin to search.paths (diff) | |
| download | android_bootable_recovery-72d75b0b40221d5c079448d7b2ad04a15d1505da.tar android_bootable_recovery-72d75b0b40221d5c079448d7b2ad04a15d1505da.tar.gz android_bootable_recovery-72d75b0b40221d5c079448d7b2ad04a15d1505da.tar.bz2 android_bootable_recovery-72d75b0b40221d5c079448d7b2ad04a15d1505da.tar.lz android_bootable_recovery-72d75b0b40221d5c079448d7b2ad04a15d1505da.tar.xz android_bootable_recovery-72d75b0b40221d5c079448d7b2ad04a15d1505da.tar.zst android_bootable_recovery-72d75b0b40221d5c079448d7b2ad04a15d1505da.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 |