Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c807687 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move recovery from /sbin to /system/bin"

parents 8d9b3aec cfb3c923

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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.

adb_install.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

  }

etc/init.rc

+1 −1
Original line number Diff line number Diff line
@@ -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