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

Commit dfe2acfa authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "init: remove the restriction of arguments" am: 2f171cc6 

am: 89c8a697

Change-Id: I002f6112bd4b18f9f6f90bf69bc51ca02af054b4
parents 62cadc71 89c8a697

init/main.cpp

+13 −18
Original line number Diff line number Diff line
@@ -57,10 +57,7 @@ int main(int argc, char** argv) { 
        return ueventd_main(argc, argv);

    }



    if (argc < 2) {

        return FirstStageMain(argc, argv);

    }



    if (argc > 1) {

        if (!strcmp(argv[1], "subcontext")) {

            android::base::InitLogging(argv, &android::base::KernelLogger);

            const BuiltinFunctionMap function_map;
@@ -75,9 +72,7 @@ int main(int argc, char** argv) { 
        if (!strcmp(argv[1], "second_stage")) {

            return SecondStageMain(argc, argv);

        }

    }



    android::base::InitLogging(argv, &android::base::KernelLogger);



    LOG(ERROR) << "Unknown argument passed to init '" << argv[1] << "'";

    return 1;

    return FirstStageMain(argc, argv);

}