Make it backwards compatible with 4.4
Change-Id: I668604cddc8e8afbf78709f3f872bea4e9f4aa06
diff --git a/etc/Android.mk b/etc/Android.mk
index 5e612b6..4614577 100644
--- a/etc/Android.mk
+++ b/etc/Android.mk
@@ -31,6 +31,26 @@
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 907436c..a62b68d 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 @@
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 0000000..bb2853c
--- /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 0000000..892b226
--- /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