PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2018-07-27 20:25:53 +00:00
committed by Gerrit Code Review
parent 8d9b3aec3d cfb3c92302
commit 4c80768796
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@@ -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.

2
adb_install.cpp
View File

@@ -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);
}

2
etc/init.rc
View File

@@ -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