Merge "init: move MarkServicesUpdate later" into main
This commit is contained in:
commit
e90d93ab6e
1 changed files with 2 additions and 1 deletions
|
|
@ -1297,7 +1297,6 @@ static Result<void> do_perform_apex_config(const BuiltinArguments& args) {
|
|||
return create_dirs.error();
|
||||
}
|
||||
auto parse_configs = ParseApexConfigs(/*apex_name=*/"");
|
||||
ServiceList::GetInstance().MarkServicesUpdate();
|
||||
if (!parse_configs.ok()) {
|
||||
return parse_configs.error();
|
||||
}
|
||||
|
|
@ -1307,6 +1306,8 @@ static Result<void> do_perform_apex_config(const BuiltinArguments& args) {
|
|||
return update_linker_config.error();
|
||||
}
|
||||
|
||||
// Now start delayed services
|
||||
ServiceList::GetInstance().MarkServicesUpdate();
|
||||
return {};
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue