tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "init: adding fallback paths for debug ramdisk"" am: 0d712ad3a2

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

Change-Id: Ia3b01afbda44bc2295fdc6a8dcaf6d2ed9583701
This commit is contained in:
Treehugger Robot 2021-05-06 07:22:40 +00:00 committed by Automerger Merge Worker
commit e21050474a
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
init/first_stage_init.cpp
View file

@ -329,23 +329,10 @@ int FirstStageMain(int argc, char** argv) {
// If "/force_debuggable" 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.
bool found_debuggable = false;
std::string adb_debug_prop("/adb_debug.prop");
std::string userdebug_sepolicy("/userdebug_plat_sepolicy.cil");
if (access("/force_debuggable", F_OK) == 0) {
found_debuggable = true;
} else if (access("/first_stage_ramdisk/force_debuggable", F_OK) == 0) {
// Fallback to legacy debug resource paths.
// TODO(b/186485355): removes the fallback path once it is not needed.
found_debuggable = true;
adb_debug_prop.insert(0, "/first_stage_ramdisk");
userdebug_sepolicy.insert(0, "/first_stage_ramdisk");
}
if (found_debuggable) {
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_sepolicy, kDebugRamdiskSEPolicy, ec)) {
if (!fs::copy_file("/adb_debug.prop", kDebugRamdiskProp, ec) ||
!fs::copy_file("/userdebug_plat_sepolicy.cil", kDebugRamdiskSEPolicy, ec)) {
LOG(ERROR) << "Failed to setup debug ramdisk";
} else {
// setenv for second-stage init to read above kDebugRamdisk* files.