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

Commit 58efb993 authored by Jooyung Han's avatar Jooyung Han Committed by android-build-merger
Browse files

Merge "init: fix to avoid loading apex *.rc files twice" am: 3d3f24bc 

am: a556a51b

Change-Id: I96040b15d6e0b816403aebd40b7c872248874e16
parents f439adae a556a51b

init/builtins.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ static Result<void> do_parse_apex_configs(const BuiltinArguments& args) { 
        // /apex/<name> paths, so unless we filter them out, we will parse the

        // same file twice.

        std::vector<std::string> paths = android::base::Split(path, "/");

        if (paths.size() >= 2 && paths[1].find('@') != std::string::npos) {

        if (paths.size() >= 3 && paths[2].find('@') != std::string::npos) {

            continue;

        }

        configs.push_back(path);