summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHridya Valsaraju <hridya@google.com>2018-07-27 23:08:15 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-07-27 23:08:15 +0200
commit1010f723c6260cb584e26759ad5d973e04375f29 (patch)
treeed451392598fa3209a45fc2dacb94434884e9415
parentMerge "Add proto3 support for care_map" am: 8d9b3aec3d am: f3480024c2 (diff)
parentMerge "Move recovery from /sbin to /system/bin" am: 4c80768796 (diff)
downloadandroid_bootable_recovery-1010f723c6260cb584e26759ad5d973e04375f29.tar
android_bootable_recovery-1010f723c6260cb584e26759ad5d973e04375f29.tar.gz
android_bootable_recovery-1010f723c6260cb584e26759ad5d973e04375f29.tar.bz2
android_bootable_recovery-1010f723c6260cb584e26759ad5d973e04375f29.tar.lz
android_bootable_recovery-1010f723c6260cb584e26759ad5d973e04375f29.tar.xz
android_bootable_recovery-1010f723c6260cb584e26759ad5d973e04375f29.tar.zst
android_bootable_recovery-1010f723c6260cb584e26759ad5d973e04375f29.zip
-rw-r--r--Android.mk2
-rw-r--r--adb_install.cpp2
-rw-r--r--etc/init.rc2
3 files changed, 3 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 906fcd6a5..73a319991 100644
--- a/Android.mk
+++ b/Android.mk
@@ -175,7 +175,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