commit 83a2197c80c9d023ac4aa1ece47d40b9723790a5
author Jooyung Han <jooyung@google.com> Mon Jul 31 23:09:13 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 31 23:09:13 2023 +0000
tree ef08f625353997a9ac767f933bd4319cfa2bb8aa
parent 94a62bb477c263461d3b6e5bace74870ecede8ef
parent ae91cd0dd640ecb552148a84962114f4ecba9196

Merge "init: move `MarkServicesUpdate` later" into main am: e90d93ab6e am: ae91cd0dd6

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

Change-Id: I00f688d81e93a6781db63543973a02a4e084fe31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 2176233..fa5e36d 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -1297,7 +1297,6 @@
         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 @@
         return update_linker_config.error();
     }
 
+    // Now start delayed services
+    ServiceList::GetInstance().MarkServicesUpdate();
     return {};
 }