commit 1010f723c6260cb584e26759ad5d973e04375f29
author Hridya Valsaraju <hridya@google.com> Fri Jul 27 14:08:15 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jul 27 14:08:15 2018 -0700
tree ed451392598fa3209a45fc2dacb94434884e9415
parent 5612006f315d114139c02ba157cb5698cbbbc4ed
parent dcc5fa4d4f533d5675385146bf1ed6079f002f86

Merge "Move recovery from /sbin to /system/bin" am: 4c80768796 am: ed2480be9b
am: dcc5fa4d4f

Change-Id: I8e38cceea21c232e325f6f55681846696718e68e

Android.mk

diff --git a/Android.mk b/Android.mk
index 906fcd6..73a3199 100644
--- a/Android.mk
+++ b/Android.mk
@@ -175,7 +175,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