commit 0321203e5a4dce699902ac2a4e1237e8ca5342d9
author Jooyung Han <jooyung@google.com> Mon Jul 08 18:19:57 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 08 18:19:57 2019 -0700
tree b5653fdad05163b541839fdf39251ecb31ce453b
parent 777ebc77fd4a416572988901a9a6fb3cee941c16
parent 7c4f41306036a556612820ef28c5abb0904d1d13

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

Change-Id: Ie48001976f740120621977bec5c58de6a2d827b2

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