Merge "Deprecate cc_binary aconfigd and the controlling flag" into main am: db80953238 am: f716e1e0ce
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3376683
Change-Id: Idd94bdbba9e2a76839eccc04efae32b6fc5aafe3
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 1986374..060395d 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -997,16 +997,8 @@
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.
mkdir /data/misc/bootanim 0755 system system