From 4bf259fab7214331920f3bde864a8e508831f299 Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Mon, 29 Aug 2016 11:50:34 -0500
Subject: Make naming scheme more meaningful

Change-Id: Ifcaf00c760ff452b0e85a88b54e91ca0f2f4644a
---
 etc/Android.mk                  | 4 ++--
 etc/init.recovery.service21.rc  | 4 ++++
 etc/init.recovery.service22.rc  | 5 +++++
 etc/init.recovery.servicenew.rc | 5 -----
 etc/init.recovery.serviceold.rc | 4 ----
 5 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 etc/init.recovery.service21.rc
 create mode 100644 etc/init.recovery.service22.rc
 delete mode 100644 etc/init.recovery.servicenew.rc
 delete mode 100644 etc/init.recovery.serviceold.rc

(limited to 'etc')

diff --git a/etc/Android.mk b/etc/Android.mk
index 461457787..decd3e2d6 100644
--- a/etc/Android.mk
+++ b/etc/Android.mk
@@ -38,7 +38,7 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 22; echo $$?),0)
     LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
     LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
 
-    LOCAL_SRC_FILES := init.recovery.servicenew.rc
+    LOCAL_SRC_FILES := init.recovery.service22.rc
     include $(BUILD_PREBUILT)
 else
     include $(CLEAR_VARS)
@@ -47,7 +47,7 @@ else
     LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
     LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
 
-    LOCAL_SRC_FILES := init.recovery.serviceold.rc
+    LOCAL_SRC_FILES := init.recovery.service21.rc
     include $(BUILD_PREBUILT)
 endif
 
diff --git a/etc/init.recovery.service21.rc b/etc/init.recovery.service21.rc
new file mode 100644
index 000000000..892b226ff
--- /dev/null
+++ b/etc/init.recovery.service21.rc
@@ -0,0 +1,4 @@
+on boot
+
+# For starting recovery on 4.4 and older
+service recovery /sbin/recovery
diff --git a/etc/init.recovery.service22.rc b/etc/init.recovery.service22.rc
new file mode 100644
index 000000000..bb2853c1a
--- /dev/null
+++ b/etc/init.recovery.service22.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.servicenew.rc b/etc/init.recovery.servicenew.rc
deleted file mode 100644
index bb2853c1a..000000000
--- a/etc/init.recovery.servicenew.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 892b226ff..000000000
--- a/etc/init.recovery.serviceold.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-on boot
-
-# For starting recovery on 4.4 and older
-service recovery /sbin/recovery
-- 
cgit v1.2.3