From cfb3c92302356c9078fc175c04be06074a106f91 Mon Sep 17 00:00:00 2001
From: Hridya Valsaraju <hridya@google.com>
Date: Thu, 26 Jul 2018 13:04:06 -0700
Subject: Move recovery from /sbin to /system/bin

Executables should be in /system/bin
rather than sbin.

Bug: 78793464
Test: boot into recovery, try adb sideload
Change-Id: I194589119a099d29e56b0648f0906a5ae2aa6770
---
 Android.mk      | 2 +-
 adb_install.cpp | 2 +-
 etc/init.rc     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 69490a57e..93e658c5a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -162,7 +162,7 @@ LOCAL_MODULE := recovery
 
 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.
diff --git a/adb_install.cpp b/adb_install.cpp
index 4ee5333c7..97dff221d 100644
--- a/adb_install.cpp
+++ b/adb_install.cpp
@@ -82,7 +82,7 @@ int apply_from_adb(bool* wipe_cache) {
 
   pid_t child;
   if ((child = fork()) == 0) {
-    execl("/sbin/recovery", "recovery", "--adbd", nullptr);
+    execl("/system/bin/recovery", "recovery", "--adbd", nullptr);
     _exit(EXIT_FAILURE);
   }
 
diff --git a/etc/init.rc b/etc/init.rc
index 96c37b11c..8e18438b5 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -85,7 +85,7 @@ service charger /charger -r
     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
-- 
cgit v1.2.3