commit 84bfd45661ebd9b88547c45604ba8d4f2bc11e7f
author Jooyung Han <jooyung@google.com> Mon Jul 08 18:27:58 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 08 18:27:58 2019 -0700
tree b5653fdad05163b541839fdf39251ecb31ce453b
parent 5e5fbfa8d2b31998f009d874023da44eeeb3f3f8
parent 0321203e5a4dce699902ac2a4e1237e8ca5342d9

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

Change-Id: I96040b15d6e0b816403aebd40b7c872248874e16

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