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

Commit d51fb54d authored by Jooyung Han's avatar Jooyung Han
Browse files

init: remove interface checks from init 

HIDL interface checks are done by host_init_verifier at build-time.

Bug: 326827772
Test: mmma system/core/init
Change-Id: I18e9590aba614bebfdbc6aa8bca7036821a6c4f3
parent 95c4242c

init/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ init_common_sources = [ 
    "capabilities.cpp",

    "epoll.cpp",

    "import_parser.cpp",

    "interface_utils.cpp",

    "interprocess_fifo.cpp",

    "keychords.cpp",

    "parser.cpp",
@@ -88,6 +87,7 @@ init_device_sources = [ 
init_host_sources = [

    "check_builtins.cpp",

    "host_import_parser.cpp",

    "interface_utils.cpp",

]



soong_config_module_type {
@@ -190,7 +190,6 @@ libinit_cc_defaults { 
        "libext4_utils",

        "libfs_mgr",

        "libgsi",

        "libhidl-gen-utils",

        "liblog",

        "liblogwrap",

        "liblp",

init/host_init_verifier.cpp

+1 −2
Original line number Diff line number Diff line
@@ -297,8 +297,7 @@ int main(int argc, char** argv) { 
    ActionManager& am = ActionManager::GetInstance();

    ServiceList& sl = ServiceList::GetInstance();

    Parser parser;

    parser.AddSectionParser("service",

                            std::make_unique<ServiceParser>(&sl, GetSubcontext(), std::nullopt));

    parser.AddSectionParser("service", std::make_unique<ServiceParser>(&sl, GetSubcontext()));

    parser.AddSectionParser("on", std::make_unique<ActionParser>(&am, GetSubcontext()));

    parser.AddSectionParser("import", std::make_unique<HostImportParser>());

init/init.cpp

+3 −5
Original line number Diff line number Diff line
@@ -268,8 +268,8 @@ void DumpState() { 
Parser CreateParser(ActionManager& action_manager, ServiceList& service_list) {

    Parser parser;



    parser.AddSectionParser("service", std::make_unique<ServiceParser>(

                                               &service_list, GetSubcontext(), std::nullopt));

    parser.AddSectionParser("service",

                            std::make_unique<ServiceParser>(&service_list, GetSubcontext()));

    parser.AddSectionParser("on", std::make_unique<ActionParser>(&action_manager, GetSubcontext()));

    parser.AddSectionParser("import", std::make_unique<ImportParser>(&parser));
@@ -324,9 +324,7 @@ Parser CreateApexConfigParser(ActionManager& action_manager, ServiceList& servic 
        }

    }

#endif  // RECOVERY

    parser.AddSectionParser("service",

                            std::make_unique<ServiceParser>(&service_list, subcontext,

                            std::nullopt));

    parser.AddSectionParser("service", std::make_unique<ServiceParser>(&service_list, subcontext));

    parser.AddSectionParser("on", std::make_unique<ActionParser>(&action_manager, subcontext));



    return parser;

init/init_test.cpp

+3 −6
Original line number Diff line number Diff line
@@ -62,8 +62,7 @@ void TestInit(const std::string& init_script_file, const BuiltinFunctionMap& tes 
    Action::set_function_map(&test_function_map);



    Parser parser;

    parser.AddSectionParser("service",

                            std::make_unique<ServiceParser>(service_list, nullptr, std::nullopt));

    parser.AddSectionParser("service", std::make_unique<ServiceParser>(service_list, nullptr));

    parser.AddSectionParser("on", std::make_unique<ActionParser>(action_manager, nullptr));

    parser.AddSectionParser("import", std::make_unique<ImportParser>(&parser));
@@ -625,8 +624,7 @@ service A something 


    ServiceList service_list;

    Parser parser;

    parser.AddSectionParser("service",

                            std::make_unique<ServiceParser>(&service_list, nullptr, std::nullopt));

    parser.AddSectionParser("service", std::make_unique<ServiceParser>(&service_list, nullptr));



    ASSERT_TRUE(parser.ParseConfig(tf.path));
@@ -657,8 +655,7 @@ service A something 


    ServiceList service_list;

    Parser parser;

    parser.AddSectionParser("service",

                            std::make_unique<ServiceParser>(&service_list, nullptr, std::nullopt));

    parser.AddSectionParser("service", std::make_unique<ServiceParser>(&service_list, nullptr));



    ASSERT_TRUE(parser.ParseConfig(tf.path));

    ASSERT_EQ(1u, parser.parse_error_count());

init/reboot_test.cpp

+1 −2
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ service $name /system/bin/yes 
                                       "$selabel", GetSecurityContext(), false);

    ServiceList& service_list = ServiceList::GetInstance();

    Parser parser;

    parser.AddSectionParser("service",

                            std::make_unique<ServiceParser>(&service_list, nullptr, std::nullopt));

    parser.AddSectionParser("service", std::make_unique<ServiceParser>(&service_list, nullptr));



    TemporaryFile tf;

    ASSERT_TRUE(tf.fd != -1);