Skip bootstrap APEX RC files for the second round
Reading .rc files from bootstrap APEXes causes "double loading".
This works for services because init just ignores duplicates. But it
emits error logs, which can mislead even though there's no actual
errors. Besides, for actions, duplicates can cause a problem when
commands are not idempotent.
So, when loading RC files from APEXes for the second time, we'd better
skip those bootstrap APEXes.
Bug: 290148081
Test: VendorApexHostTestCases
Change-Id: Ia630dbd14046064b5e5c612c01ebacf57091c8d4
diff --git a/init/builtins.cpp b/init/builtins.cpp
index e40b831..2ced66d 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -1307,9 +1307,9 @@
}
}
- auto parse_configs = ParseApexConfigs(/*apex_name=*/"");
- if (!parse_configs.ok()) {
- return parse_configs.error();
+ auto parse_result = ParseRcScriptsFromAllApexes(bootstrap);
+ if (!parse_result.ok()) {
+ return parse_result.error();
}
auto update_linker_config = do_update_linker_config(args);