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

Commit 2374a6d6 authored by Will McVicker's avatar Will McVicker Committed by Automerger Merge Worker
Browse files

Merge "init: fix debuggable paths for recovery mode" am: fb9953e4 am:... 

Merge "init: fix debuggable paths for recovery mode" am: fb9953e4 am: dc64a958 am: f737aa85 am: b8325c03

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

Change-Id: I3074bbf6e64a11d49cc66e530ad9a87bf804884c
parents 65d83b57 b8325c03

init/first_stage_init.cpp

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