commit 21932fae4ca8a7e708d097a8e05a7bae9c2d8598
author Robin Peng <robinpeng@google.com> Thu Jul 14 18:58:27 2022 +0800
committer Robin Peng <robinpeng@google.com> Thu Jul 14 13:08:55 2022 +0000
tree e836b8777c4452e48838805ef65c072b151c0601
parent b94ea0c39e5cef4ff5bb1dd85d515d22d7c195b3

init.gs101.rc: remove vendor.device.modules.ready from 'on init' section

1) for projects with device specific modules, this property should only
   be set while device modules been loaded.
2) also remove "wait_for_prop vendor.device.modules.ready 1" to prevent
   infinite wait
3) migrate vendor.all.modules.ready/vendor.all.devices.ready to
   init.insmod.<DEVICE>.cfg and set these proprieties while .cfg not
   exist

Bug: 238853979
Signed-off-by: Robin Peng <robinpeng@google.com>
Change-Id: I17aa42ef0a459c33871891e5036edf7eea57e39a

conf/init.gs101.rc

diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index a94e148..c760bcb 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -328,10 +328,6 @@
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/mem_latency/ratio_ceil 3200
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/mem_latency/ratio_ceil 3200
 
-# For GKI kernel, no device specific modules
-on init
-    setprop vendor.device.modules.ready 1
-
 on init && property:ro.boot.hw.soc.rev=0
     setprop vendor.powerhal.config powerhint_a0.json
 
@@ -474,13 +470,6 @@
     # Wait for insmod_sh to finish all common modules
     wait_for_prop vendor.common.modules.ready 1
 
-    # Wait for insmod_sh to finish all device specific modules
-    wait_for_prop vendor.device.modules.ready 1
-
-    # Other services depend on the properties
-    setprop vendor.all.modules.ready 1
-    setprop vendor.all.devices.ready 1
-
     # Permission for Health Storage HAL
     chown system system /dev/sys/block/bootdevice/manual_gc
 

init.insmod.sh

diff --git a/init.insmod.sh b/init.insmod.sh
index 97ae7bc..645391a 100755
--- a/init.insmod.sh
+++ b/init.insmod.sh
@@ -51,6 +51,8 @@
   # to unblock early-boot trigger
   setprop vendor.common.modules.ready
   setprop vendor.device.modules.ready
+  setprop vendor.all.modules.ready
+  setprop vendor.all.devices.ready
   exit 1
 fi