Merge "init.rc: set up init.rc for aconfigd to initialize mainline storage" into main am: 086371cb49 am: d0ed4346f9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3092324
Change-Id: I145cddf08195a724098d556dcb071239bb81b1ab
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 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