ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: fix debuggable paths for recovery mode" am: fb9953e4d3

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1634601

Change-Id: Ic4e1b96cb088ae53094a73ef7aa45a41591d799e
This commit is contained in:
Will McVicker 2021-03-18 22:38:03 +00:00 • committed by Automerger Merge Worker
commit dc64a95871
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
init/first_stage_init.cpp
View file

@ -337,12 +337,21 @@ int FirstStageMain(int argc, char** argv) {
SwitchRoot("/first_stage_ramdisk");
}
std::string force_debuggable("/force_debuggable");
std::string adb_debug_prop("/adb_debug.prop");
std::string userdebug_sepolicy("/userdebug_plat_sepolicy.cil");
if (IsRecoveryMode()) {
// Update these file paths since we didn't switch root
force_debuggable.insert(0, "/first_stage_ramdisk");
adb_debug_prop.insert(0, "/first_stage_ramdisk");
userdebug_sepolicy.insert(0, "/first_stage_ramdisk");
}
// If this file is present, the second-stage init will use a userdebug sepolicy
// and load adb_debug.prop to allow adb root, if the device is unlocked.
if (access("/force_debuggable", F_OK) == 0) {
if (access(force_debuggable.c_str(), F_OK) == 0) {
std::error_code ec; // to invoke the overloaded copy_file() that won't throw.
if (!fs::copy_file("/adb_debug.prop", kDebugRamdiskProp, ec) ||
!fs::copy_file("/userdebug_plat_sepolicy.cil", kDebugRamdiskSEPolicy, ec)) {
if (!fs::copy_file(adb_debug_prop, kDebugRamdiskProp, ec) ||
!fs::copy_file(userdebug_sepolicy, kDebugRamdiskSEPolicy, ec)) {
LOG(ERROR) << "Failed to setup debug ramdisk";
} else {
// setenv for second-stage init to read above kDebugRamdisk* files.