Merge "init.rc: Move /system/bin/boringssl_self_test{32,64} call to early-init." (6f735df0) · Commits · e / os / android_system_core

rootdir/init.rc

+14 −14

Original line number	Diff line number	Diff line
		@@ -52,6 +52,20 @@ on early-init
		# the libraries are available to the processes started after this statement.
		exec_start apexd-bootstrap

		# These must already exist by the time boringssl_self_test32 / boringssl_self_test64 run.
		mkdir /dev/boringssl 0755 root root
		mkdir /dev/boringssl/selftest 0755 root root

		# Run boringssl self test for each ABI so that later processes can skip it. http://b/139348610
		on early-init && property:ro.product.cpu.abilist32=*
		exec_reboot_on_failure boringssl-self-check-failed /system/bin/boringssl_self_test32
		on early-init && property:ro.product.cpu.abilist64=*
		exec_reboot_on_failure boringssl-self-check-failed /system/bin/boringssl_self_test64
		on property:apexd.status=ready && property:ro.product.cpu.abilist64=*
		exec_reboot_on_failure boringssl-self-check-failed /apex/com.android.conscrypt/bin/boringssl_self_test64
		on property:apexd.status=ready && property:ro.product.cpu.abilist32=*
		exec_reboot_on_failure boringssl-self-check-failed /apex/com.android.conscrypt/bin/boringssl_self_test32

		on init
		sysclktz 0

		@@ -127,10 +141,6 @@ on init
		mkdir /mnt/expand 0771 system system
		mkdir /mnt/appfuse 0711 root root

		# These must already exist by the time boringssl_self_test32 / boringssl_self_test64 run.
		mkdir /dev/boringssl 0755 root root
		mkdir /dev/boringssl/selftest 0755 root root

		# Storage views to support runtime permissions
		mkdir /mnt/runtime 0700 root root
		mkdir /mnt/runtime/default 0755 root root
		@@ -315,16 +325,6 @@ on init
		start hwservicemanager
		start vndservicemanager

		# Run boringssl self test for each ABI so that later processes can skip it. http://b/139348610
		on init && property:ro.product.cpu.abilist32=*
		exec_reboot_on_failure boringssl-self-check-failed /system/bin/boringssl_self_test32
		on init && property:ro.product.cpu.abilist64=*
		exec_reboot_on_failure boringssl-self-check-failed /system/bin/boringssl_self_test64
		on property:apexd.status=ready && property:ro.product.cpu.abilist64=*
		exec_reboot_on_failure boringssl-self-check-failed /apex/com.android.conscrypt/bin/boringssl_self_test64
		on property:apexd.status=ready && property:ro.product.cpu.abilist32=*
		exec_reboot_on_failure boringssl-self-check-failed /apex/com.android.conscrypt/bin/boringssl_self_test32

		# Healthd can trigger a full boot from charger mode by signaling this
		# property when the power button is held.
		on property:sys.boot_from_charger_mode=1