diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Android.mk | 15 | ||||
| -rw-r--r-- | etc/init.rc | 1 | ||||
| -rwxr-xr-x | etc/init.recovery.mksh.rc | 2 | ||||
| -rw-r--r-- | etc/init.recovery.service22.rc | 6 |
4 files changed, 18 insertions, 6 deletions
diff --git a/etc/Android.mk b/etc/Android.mk index cda0f372e..4aeb251dc 100644 --- a/etc/Android.mk +++ b/etc/Android.mk @@ -88,3 +88,18 @@ ifeq ($(TWRP_INCLUDE_LOGCAT), true) include $(BUILD_PREBUILT) endif endif + +ifeq ($(TW_USE_TOOLBOX), true) + include $(CLEAR_VARS) + LOCAL_MODULE := init.recovery.mksh.rc + LOCAL_MODULE_TAGS := eng + LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES + + # Cannot send to TARGET_RECOVERY_ROOT_OUT since build system wipes init*.rc + # during ramdisk creation and only allows init.recovery.*.rc files to be copied + # from TARGET_ROOT_OUT thereafter + LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) + + LOCAL_SRC_FILES := $(LOCAL_MODULE) + include $(BUILD_PREBUILT) +endif diff --git a/etc/init.rc b/etc/init.rc index bcd519b03..348471d4f 100644 --- a/etc/init.rc +++ b/etc/init.rc @@ -1,4 +1,5 @@ import /init.recovery.logd.rc +import /init.recovery.mksh.rc import /init.recovery.usb.rc import /init.recovery.service.rc import /init.recovery.vold_decrypt.rc diff --git a/etc/init.recovery.mksh.rc b/etc/init.recovery.mksh.rc new file mode 100755 index 000000000..3afd946f3 --- /dev/null +++ b/etc/init.recovery.mksh.rc @@ -0,0 +1,2 @@ +on init + export ENV /etc/mkshrc diff --git a/etc/init.recovery.service22.rc b/etc/init.recovery.service22.rc index 43a3374b4..bb2853c1a 100644 --- a/etc/init.recovery.service22.rc +++ b/etc/init.recovery.service22.rc @@ -1,11 +1,5 @@ on boot - export LD_CONFIG_FILE /sbin/ld.config.txt # For starting recovery on 5.0 and newer service recovery /sbin/recovery seclabel u:r:recovery:s0 - -# This helps fix ld.config.txt errors from the linker on Android 8.1 -service ldconfigtxt /sbin/touch /sbin/ld.config.txt - oneshot - seclabel u:r:recovery:s0 |