commit 58ba0b44c2c1a744d10b2c35199175eac4d48d45
author Jooyung Han <jooyung@google.com> Mon Jul 31 21:53:57 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 31 21:53:57 2023 +0000
tree cf1542c1af8ba2f504d5cd6807736b1ceb40c2ed
parent e90d93ab6eb874087795cd627e53a693d00b83f7
parent 201801ce8eb5e001de9e669e55ee507e18bcae66

Merge "Use /bootstrap-apex for bootstrap APEXes" into main

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index e4f0bd0..cf784ac 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -1342,7 +1342,6 @@
         return create_dirs.error();
     }
     auto parse_configs = ParseApexConfigs(/*apex_name=*/"");
-    ServiceList::GetInstance().MarkServicesUpdate();
     if (!parse_configs.ok()) {
         return parse_configs.error();
     }
@@ -1352,6 +1351,8 @@
         return update_linker_config.error();
     }
 
+    // Now start delayed services
+    ServiceList::GetInstance().MarkServicesUpdate();
     return {};
 }