tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Run boringssl tests according to ro.zygote" into main am: a2bac909ce

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2702893

Change-Id: I2ce4e4ebb22ec65dc4b5108131f9df21cf4a3200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-08-22 13:12:05 +00:00 committed by Automerger Merge Worker
commit 052542d0fd
4 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
rootdir/Android.bp
View file

@ -16,6 +16,22 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
prebuilt_etc {
name: "init.boringssl.zygote64_32.rc",
src: "init.boringssl.zygote64_32.rc",
sub_dir: "init/hw",
symlinks: [
"init.boringssl.zygote32.rc",
"init.boringssl.no_zygote.rc",
],
}
prebuilt_etc {
name: "init.boringssl.zygote64.rc",
src: "init.boringssl.zygote64.rc",
sub_dir: "init/hw",
}
prebuilt_etc {
name: "init.rc",
src: "init.rc",
@ -23,6 +39,8 @@ prebuilt_etc {
required: [
"fsverity_init",
"platform-bootclasspath",
"init.boringssl.zygote64.rc",
"init.boringssl.zygote64_32.rc",
],
}

4
rootdir/init.boringssl.zygote64.rc Normal file
View file

@ -0,0 +1,4 @@
on init && property:ro.product.cpu.abilist64=*
exec_start boringssl_self_test64
on property:apexd.status=ready && property:ro.product.cpu.abilist64=*
exec_start boringssl_self_test_apex64

8
rootdir/init.boringssl.zygote64_32.rc Normal file
View file

@ -0,0 +1,8 @@
on init && property:ro.product.cpu.abilist32=*
exec_start boringssl_self_test32
on init && property:ro.product.cpu.abilist64=*
exec_start boringssl_self_test64
on property:apexd.status=ready && property:ro.product.cpu.abilist32=*
exec_start boringssl_self_test_apex32
on property:apexd.status=ready && property:ro.product.cpu.abilist64=*
exec_start boringssl_self_test_apex64

9
rootdir/init.rc
View file

@ -459,14 +459,7 @@ on init
start vndservicemanager
# Run boringssl self test for each ABI. Any failures trigger reboot to firmware.
on init && property:ro.product.cpu.abilist32=*
exec_start boringssl_self_test32
on init && property:ro.product.cpu.abilist64=*
exec_start boringssl_self_test64
on property:apexd.status=ready && property:ro.product.cpu.abilist32=*
exec_start boringssl_self_test_apex32
on property:apexd.status=ready && property:ro.product.cpu.abilist64=*
exec_start boringssl_self_test_apex64
import /system/etc/init/hw/init.boringssl.${ro.zygote}.rc
service boringssl_self_test32 /system/bin/boringssl_self_test32
reboot_on_failure reboot,boringssl-self-check-failed