Merge "Move recovery to /system/bin"

am: 0937a84521

Change-Id: Ic3f3eb82178e6c5af22945e3aaaac3f86beb4ec8
This commit is contained in:
Jerry Zhang 2018-07-27 13:34:11 -07:00 committed by android-build-merger
commit 3051d54902
2 changed files with 2 additions and 2 deletions

View File

@ -811,7 +811,7 @@ struct fstab *fs_mgr_read_fstab_default()
std::string default_fstab;
// Use different fstab paths for normal boot and recovery boot, respectively
if (access("/sbin/recovery", F_OK) == 0) {
if (access("/system/bin/recovery", F_OK) == 0) {
default_fstab = "/etc/recovery.fstab";
} else { // normal boot
default_fstab = get_fstab_path();

View File

@ -116,7 +116,7 @@ static inline bool IsDtVbmetaCompatible() {
}
static bool inline IsRecoveryMode() {
return access("/sbin/recovery", F_OK) == 0;
return access("/system/bin/recovery", F_OK) == 0;
}
static inline bool IsDmLinearEnabled() {