diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2016-08-25 22:32:21 +0200 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2016-08-25 22:36:13 +0200 |
| commit | f117962eb25bde75e981c3bff91ba708a55df65e (patch) | |
| tree | 4d8565830b460a940ad33701e953d0371a0e5355 /etc | |
| parent | Update to 7.0 (diff) | |
| download | android_bootable_recovery-f117962eb25bde75e981c3bff91ba708a55df65e.tar android_bootable_recovery-f117962eb25bde75e981c3bff91ba708a55df65e.tar.gz android_bootable_recovery-f117962eb25bde75e981c3bff91ba708a55df65e.tar.bz2 android_bootable_recovery-f117962eb25bde75e981c3bff91ba708a55df65e.tar.lz android_bootable_recovery-f117962eb25bde75e981c3bff91ba708a55df65e.tar.xz android_bootable_recovery-f117962eb25bde75e981c3bff91ba708a55df65e.tar.zst android_bootable_recovery-f117962eb25bde75e981c3bff91ba708a55df65e.zip | |
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Android.mk | 20 | ||||
| -rw-r--r-- | etc/init.rc | 4 | ||||
| -rw-r--r-- | etc/init.recovery.servicenew.rc | 5 | ||||
| -rw-r--r-- | etc/init.recovery.serviceold.rc | 4 |
4 files changed, 30 insertions, 3 deletions
diff --git a/etc/Android.mk b/etc/Android.mk index 5e612b63e..461457787 100644 --- a/etc/Android.mk +++ b/etc/Android.mk @@ -31,6 +31,26 @@ include $(BUILD_PREBUILT) endif +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 22; echo $$?),0) + include $(CLEAR_VARS) + LOCAL_MODULE := init.recovery.service.rc + LOCAL_MODULE_TAGS := eng + LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES + LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) + + LOCAL_SRC_FILES := init.recovery.servicenew.rc + include $(BUILD_PREBUILT) +else + include $(CLEAR_VARS) + LOCAL_MODULE := init.recovery.service.rc + LOCAL_MODULE_TAGS := eng + LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES + LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) + + LOCAL_SRC_FILES := init.recovery.serviceold.rc + include $(BUILD_PREBUILT) +endif + ifeq ($(TWRP_INCLUDE_LOGCAT), true) ifeq ($(TARGET_USES_LOGD), true) diff --git a/etc/init.rc b/etc/init.rc index 907436c71..a62b68d84 100644 --- a/etc/init.rc +++ b/etc/init.rc @@ -1,5 +1,6 @@ import /init.recovery.logd.rc import /init.recovery.usb.rc +import /init.recovery.service.rc import /init.recovery.${ro.hardware}.rc on early-init @@ -109,9 +110,6 @@ service healthd /sbin/healthd -r critical seclabel u:r:healthd:s0 -service recovery /sbin/recovery - seclabel u:r:recovery:s0 - service adbd /sbin/adbd --root_seclabel=u:r:su:s0 --device_banner=recovery disabled socket adbd stream 660 system system diff --git a/etc/init.recovery.servicenew.rc b/etc/init.recovery.servicenew.rc new file mode 100644 index 000000000..bb2853c1a --- /dev/null +++ b/etc/init.recovery.servicenew.rc @@ -0,0 +1,5 @@ +on boot + +# For starting recovery on 5.0 and newer +service recovery /sbin/recovery + seclabel u:r:recovery:s0 diff --git a/etc/init.recovery.serviceold.rc b/etc/init.recovery.serviceold.rc new file mode 100644 index 000000000..892b226ff --- /dev/null +++ b/etc/init.recovery.serviceold.rc @@ -0,0 +1,4 @@ +on boot + +# For starting recovery on 4.4 and older +service recovery /sbin/recovery |