summaryrefslogtreecommitdiff
path: root/init/builtins.cpp
diff options
context:
space:
mode:
authorJooyung Han <jooyung@google.com>2019-07-05 11:22:18 +0900
committerJooyung Han <jooyung@google.com>2019-07-05 11:22:18 +0900
commit9c4fa66706896906ccbca60555dbc87ddd00aac9 (patch)
tree716074cca38efee86567825c7078b131cae9cf6c /init/builtins.cpp
parentc538656d7d991ceb1058ac624be95bca45780d9d (diff)
init: fix to avoid loading apex *.rc files twice
Test: adb shell dmesg | grep "init: Parsing file /apex" shows a single entry for each APEX'es *rc file Change-Id: I9006cc3d0cb7bdfe7532279f29d8095b7d16a807
Diffstat (limited to 'init/builtins.cpp')
-rw-r--r--init/builtins.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp
index cc84aa086..55b024891 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -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);