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

Commit 1d2b29a9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "init: rename init_first_stage"

parents 258109ce 38a11ccd

init/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -104,9 +104,9 @@ cc_library_static { 
        "devices.cpp",

        "epoll.cpp",

        "firmware_handler.cpp",

        "first_stage_mount.cpp",

        "import_parser.cpp",

        "init.cpp",

        "init_first_stage.cpp",

        "keychords.cpp",

        "parser.cpp",

        "persistent_properties.cpp",

init/init_first_stage.cpp→init/first_stage_mount.cpp

+14 −13
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "init_first_stage.h"

#include "first_stage_mount.h"



#include <stdlib.h>

#include <unistd.h>
@@ -125,7 +125,8 @@ static inline bool IsDmLinearEnabled() { 
    if (checked) {

        return enabled;

    }

    import_kernel_cmdline(false, [](const std::string& key, const std::string& value, bool in_qemu) {

    import_kernel_cmdline(false,

                          [](const std::string& key, const std::string& value, bool in_qemu) {

                              if (key == "androidboot.logical_partitions" && value == "1") {

                                  enabled = true;

                              }
@@ -149,9 +150,9 @@ FirstStageMount::FirstStageMount() 
    }



    auto boot_devices = fs_mgr_get_boot_devices();

    device_handler_ =

        std::make_unique<DeviceHandler>(std::vector<Permissions>{}, std::vector<SysfsPermissions>{},

                                        std::vector<Subsystem>{}, std::move(boot_devices), false);

    device_handler_ = std::make_unique<DeviceHandler>(

            std::vector<Permissions>{}, std::vector<SysfsPermissions>{}, std::vector<Subsystem>{},

            std::move(boot_devices), false);

}



std::unique_ptr<FirstStageMount> FirstStageMount::Create() {

init/init_first_stage.h→init/first_stage_mount.h

+1 −4
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 */



#ifndef _INIT_FIRST_STAGE_H

#define _INIT_FIRST_STAGE_H

#pragma once



namespace android {

namespace init {
@@ -25,5 +24,3 @@ void SetInitAvbVersionInRecovery(); 


}  // namespace init

}  // namespace android
 


#endif

init/init.cpp

+1 −1
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ 


#include "action_parser.h"

#include "epoll.h"

#include "first_stage_mount.h"

#include "import_parser.h"

#include "init_first_stage.h"

#include "keychords.h"

#include "property_service.h"

#include "reboot.h"