From f106650b04706705683f60ca4fc4cbfad0f8fb05 Mon Sep 17 00:00:00 2001 From: Owen Kim Date: Tue, 16 Nov 2021 07:08:15 +0000 Subject: [PATCH] Revert "Load persist props before starting apexd." Revert "Demonstrate multi-installed APEXes." Revert "Adds a new prop context for choosing between multi-insta..." Revert "Adds multi_install_skip_symbol_files field (default fals..." Revert submission 1869814-vapex-multi-config Bug: 206551398 Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/view?invocationId=I55600009996329947&testResultId=TR93527797572038984, bug b/206551398 Reverted Changes: I0cd9d748d:Adds multi_install_skip_symbol_files field (defaul... I5912a18e3:Demonstrate multi-installed APEXes. I0e6881e3a:Load persist props before starting apexd. I932442ade:Adds a new prop context for choosing between multi... I754ecc3f7:Allow users to choose between multi-installed vend... Change-Id: I27a4985061b112af7d0e9b95b6d42ccd9b846471 --- rootdir/init.rc | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index 1b0030371..27fa05951 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -460,6 +460,11 @@ on property:sys.boot_from_charger_mode=1 class_stop charger trigger late-init +on load_persist_props_action + load_persist_props + start logd + start logd-reinit + # Indicate to fw loaders that the relevant mounts are up. on firmware_mounts_complete rm /dev/.booting @@ -486,6 +491,9 @@ on late-init # /data, which in turn can only be loaded when system properties are present. trigger post-fs-data + # Load persist properties and override properties (if enabled) from /data. + trigger load_persist_props_action + # Should be before netd, but after apex, properties and logging is available. trigger load_bpf_programs @@ -668,18 +676,6 @@ on post-fs-data # use of MAX_BOOT_LEVEL keys. exec - system system -- /system/bin/vdc keymaster earlyBootEnded - # Multi-installed APEXes are selected using persist props. - # Load persist properties and override properties (if enabled) from /data, - # before starting apexd. - load_persist_props - start logd - start logd-reinit - # Some existing vendor rc files use 'on load_persist_props_action' to know - # when persist props are ready. These are difficult to change due to GRF, - # so continue triggering this action here even though props are already loaded - # by the 'load_persist_props' call above. - trigger load_persist_props_action - # /data/apex is now available. Start apexd to scan and activate APEXes. # # To handle userspace reboots as well as devices that use FDE, make sure