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

Commit 9afcdc82 authored by Jaekyun Seok's avatar Jaekyun Seok Committed by android-build-merger
Browse files

Merge "Treblize init.rc location" 

am: 76e9a180

Change-Id: I8415b555308b8ad489413f9e99f6e73ee9caa17e
parents 5498d39b 76e9a180

init/builtins.cpp

+12 −9
Original line number Diff line number Diff line
@@ -476,15 +476,18 @@ exit_success: 
static void import_late(const std::vector<std::string>& args, size_t start_index, size_t end_index) {

    Parser& parser = Parser::GetInstance();

    if (end_index <= start_index) {

        // Use the default set if no path is given

        static const std::vector<std::string> init_directories = {

            "/system/etc/init",

            "/vendor/etc/init",

            "/odm/etc/init"

        };



        for (const auto& dir : init_directories) {

            parser.ParseConfig(dir);

        // Fallbacks for partitions on which early mount isn't enabled.

        if (!parser.is_system_etc_init_loaded()) {

            parser.ParseConfig("/system/etc/init");

            parser.set_is_system_etc_init_loaded(true);

        }

        if (!parser.is_vendor_etc_init_loaded()) {

            parser.ParseConfig("/vendor/etc/init");

            parser.set_is_vendor_etc_init_loaded(true);

        }

        if (!parser.is_odm_etc_init_loaded()) {

            parser.ParseConfig("/odm/etc/init");

            parser.set_is_odm_etc_init_loaded(true);

        }

    } else {

        for (size_t i = start_index; i < end_index; ++i) {

init/init.cpp

+8 −0
Original line number Diff line number Diff line
@@ -992,8 +992,16 @@ int main(int argc, char** argv) { 
    std::string bootscript = property_get("ro.boot.init_rc");

    if (bootscript.empty()) {

        parser.ParseConfig("/init.rc");

        parser.set_is_system_etc_init_loaded(

                parser.ParseConfig("/system/etc/init"));

        parser.set_is_vendor_etc_init_loaded(

                parser.ParseConfig("/vendor/etc/init"));

        parser.set_is_odm_etc_init_loaded(parser.ParseConfig("/odm/etc/init"));

    } else {

        parser.ParseConfig(bootscript);

        parser.set_is_system_etc_init_loaded(true);

        parser.set_is_vendor_etc_init_loaded(true);

        parser.set_is_odm_etc_init_loaded(true);

    }



    ActionManager& am = ActionManager::GetInstance();

init/init_parser.h

+15 −0
Original line number Diff line number Diff line
@@ -41,6 +41,18 @@ public: 
    bool ParseConfig(const std::string& path);

    void AddSectionParser(const std::string& name,

                          std::unique_ptr<SectionParser> parser);

    void set_is_system_etc_init_loaded(bool loaded) {

        is_system_etc_init_loaded_ = loaded;

    }

    void set_is_vendor_etc_init_loaded(bool loaded) {

        is_vendor_etc_init_loaded_ = loaded;

    }

    void set_is_odm_etc_init_loaded(bool loaded) {

        is_odm_etc_init_loaded_ = loaded;

    }

    bool is_system_etc_init_loaded() { return is_system_etc_init_loaded_; }

    bool is_vendor_etc_init_loaded() { return is_vendor_etc_init_loaded_; }

    bool is_odm_etc_init_loaded() { return is_odm_etc_init_loaded_; }



private:

    Parser();
@@ -50,6 +62,9 @@ private: 
    bool ParseConfigDir(const std::string& path);



    std::map<std::string, std::unique_ptr<SectionParser>> section_parsers_;

    bool is_system_etc_init_loaded_ = false;

    bool is_vendor_etc_init_loaded_ = false;

    bool is_odm_etc_init_loaded_ = false;

};



#endif