commit 1e8e6a839438a345a9054319d8efda6c95236557
author Tom Cherry <tomcherry@google.com> Fri Sep 04 18:02:34 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 04 18:02:34 2015 +0000
tree 0073fe6b0afd27ed8e45ae880b0b7308273cfc3f
parent 834c92b7b145b0ae1800f869170e9ae6d2834fef
parent cf11a1601522c669c6df2095d71601546cc7fc7f

am cf11a160: am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc"

* commit 'cf11a1601522c669c6df2095d71601546cc7fc7f':
  move uncrypt from init.rc to uncrypt.rc

uncrypt/Android.mk

diff --git a/uncrypt/Android.mk b/uncrypt/Android.mk
index f31db42..6422cb2 100644
--- a/uncrypt/Android.mk
+++ b/uncrypt/Android.mk
@@ -26,4 +26,6 @@
 
 LOCAL_STATIC_LIBRARIES := libbase liblog libfs_mgr libcutils
 
+LOCAL_INIT_RC := uncrypt.rc
+
 include $(BUILD_EXECUTABLE)

uncrypt/uncrypt.rc

diff --git a/uncrypt/uncrypt.rc b/uncrypt/uncrypt.rc
new file mode 100644
index 0000000..5f4c479
--- /dev/null
+++ b/uncrypt/uncrypt.rc
@@ -0,0 +1,9 @@
+service uncrypt /system/bin/uncrypt
+    class main
+    disabled
+    oneshot
+
+service pre-recovery /system/bin/uncrypt --reboot
+    class main
+    disabled
+    oneshot