Merge "Start aconfigd_system processes in init.rc" into main am: b842f642d9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3343282
Change-Id: Ia671c3fce477f4bfb7050a5fe96e4074da6d0fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 5bb64cc..617e60a 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -614,6 +614,9 @@
mkdir /metadata/aconfig/boot 0775 root system
mkdir /metadata/aconfig_test_missions 0775 root system
+
+ # See flag enable_system_aconfigd_rust, which toggles these processes.
+ exec_start system_aconfigd_platform_init
exec_start aconfigd-platform-init
on late-fs
@@ -1002,7 +1005,16 @@
# Wait for apexd to finish activating APEXes before starting more processes.
wait_for_prop apexd.status activated
perform_apex_config
+
+ # See flag enable_system_aconfigd_rust, which toggles these processes.
exec_start aconfigd-mainline-init
+ exec_start system_aconfigd_mainline_init
+
+ # system_aconfigd_socket_service is replacing aconfigd:
+ # - A flag (enable_system_aconfigd_rust) toggles which socket executes.
+ # - When enabled, aconfigd is a no-op, system_aconfigd_socket_service executes.
+ # - Conversely, when disabled, aconfigd executes, and system_aconfigd_socket_service is a no-op.
+ start system_aconfigd_socket_service
start aconfigd
# Create directories for boot animation.