diff options
| author | Hridya Valsaraju <hridya@google.com> | 2018-07-27 22:34:20 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-27 22:34:20 +0200 |
| commit | ed2480be9b82f87283ee80714771d664093ec69e (patch) | |
| tree | ed451392598fa3209a45fc2dacb94434884e9415 | |
| parent | Merge "Add proto3 support for care_map" (diff) | |
| parent | Merge "Move recovery from /sbin to /system/bin" (diff) | |
| download | android_bootable_recovery-ed2480be9b82f87283ee80714771d664093ec69e.tar android_bootable_recovery-ed2480be9b82f87283ee80714771d664093ec69e.tar.gz android_bootable_recovery-ed2480be9b82f87283ee80714771d664093ec69e.tar.bz2 android_bootable_recovery-ed2480be9b82f87283ee80714771d664093ec69e.tar.lz android_bootable_recovery-ed2480be9b82f87283ee80714771d664093ec69e.tar.xz android_bootable_recovery-ed2480be9b82f87283ee80714771d664093ec69e.tar.zst android_bootable_recovery-ed2480be9b82f87283ee80714771d664093ec69e.zip | |
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | adb_install.cpp | 2 | ||||
| -rw-r--r-- | etc/init.rc | 2 |
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 |