ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Treehugger Robot 2019-07-09 00:37:31 +00:00 • committed by Gerrit Code Review
commit 3d3f24bc22
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
init/builtins.cpp
View file

@ -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);