commit 4c807687965dfc1bd8a9df122c9ec368dfb1a3d3
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 27 20:25:53 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 27 20:25:53 2018 +0000
tree 96f21b978dd20f2f2bb32540993d637acf74a06a
parent 8d9b3aec3d4969dca5d2e1d0bc1ef98221969032
parent cfb3c92302356c9078fc175c04be06074a106f91

Merge "Move recovery from /sbin to /system/bin"

Android.mk

diff --git a/Android.mk b/Android.mk
index 69490a5..93e658c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -162,7 +162,7 @@
 
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 
-LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/system/bin
 
 # Cannot link with LLD: undefined symbol: UsbNoPermissionsLongHelpText
 # http://b/77543887, lld does not handle -Wl,--gc-sections as well as ld.

adb_install.cpp

diff --git a/adb_install.cpp b/adb_install.cpp
index 4ee5333..97dff22 100644
--- a/adb_install.cpp
+++ b/adb_install.cpp
@@ -82,7 +82,7 @@
 
   pid_t child;
   if ((child = fork()) == 0) {
-    execl("/sbin/recovery", "recovery", "--adbd", nullptr);
+    execl("/system/bin/recovery", "recovery", "--adbd", nullptr);
     _exit(EXIT_FAILURE);
   }
 

etc/init.rc

diff --git a/etc/init.rc b/etc/init.rc
index 96c37b1..8e18438 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -85,7 +85,7 @@
     critical
     seclabel u:r:charger:s0
 
-service recovery /sbin/recovery
+service recovery /system/bin/recovery
     seclabel u:r:recovery:s0
 
 service adbd /system/bin/adbd --root_seclabel=u:r:su:s0 --device_banner=recovery