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

Commit 07b2986e authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Don't fail when no glob match" am: e04aa9e0 am: 5bab487f 

am: a303f9e6

Change-Id: I20de1fc5a457cae6b9f191904e3ea0c63e051a1d
parents 3ed64eb3 a303f9e6

init/builtins.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1060,7 +1060,8 @@ static Result<Success> do_parse_apex_configs(const BuiltinArguments& args) { 
    // where the APEXes are really mounted at. Otherwise, we will parse the

    // same file twice.

    static constexpr char glob_pattern[] = "/apex/*@*/etc/*.rc";

    if (glob(glob_pattern, GLOB_MARK, nullptr, &glob_result) != 0) {

    const int ret = glob(glob_pattern, GLOB_MARK, nullptr, &glob_result);

    if (ret != 0 && ret != GLOB_NOMATCH) {

        globfree(&glob_result);

        return Error() << "glob pattern '" << glob_pattern << "' failed";

    }