Merge "init: move MarkServicesUpdate later" into main am: e90d93ab6e am: ae91cd0dd6 am: 83a2197c80 am: 85d9528574 am: 27288f97f1

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2680615

Change-Id: If75033d40151025d8db4e18dca0183afdecd8915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jooyung Han 2023-08-01 01:18:06 +00:00 committed by Automerger Merge Worker
commit 389348d0e1

View file

@ -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 {};
}