commit b9c16a0829c6ad7e61128c85088a9fd7f55b0126
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 17 16:49:29 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 17 16:49:29 2024 +0000
tree 35c8f289fb8cc2b701be8f132813426f9efa1838
parent 086371cb499cb911ed59fe20c8a6d370dcdbeba2
parent aed74bad41a6c2ae44f65bf9f3b0593ca86613e2

Merge "Remove stray semicolon." into main

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index f7f0cc3..e8b737d 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -640,8 +640,7 @@
     mkdir /metadata/aconfig/boot 0775 root system
 
     mkdir /metadata/aconfig_test_missions 0775 root system
-    exec_start aconfigd-init
-    start aconfigd
+    exec_start aconfigd-platform-init
 
 on late-fs
     # Ensure that tracefs has the correct permissions.
@@ -1031,6 +1030,8 @@
     # Wait for apexd to finish activating APEXes before starting more processes.
     wait_for_prop apexd.status activated
     perform_apex_config
+    exec_start aconfigd-mainline-init
+    start aconfigd
 
     # Create directories for boot animation.
     mkdir /data/misc/bootanim 0755 system system