commit 3d3f24bc2271efa66888cdbb5ecc88f77aa1cfaa
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 09 00:37:31 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 09 00:37:31 2019 +0000
tree ce6e0a23e25e23a570b90089ed78102ea648b3ab
parent 463773b733e6c24c94fe2ffb46b6e00224d89e58
parent 9c4fa66706896906ccbca60555dbc87ddd00aac9

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

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index cc84aa0..55b0248 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -1107,7 +1107,7 @@
         // /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);