Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fe2aa91 authored by Pete Bentley's avatar Pete Bentley Committed by Automerger Merge Worker
Browse files

Merge "Move boringssl self tests from early-init to init." am: 00bf9dcb am: 4e245edf 

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



Change-Id: Idaee19feb80139dbb99b08d2c3c38e01d97c730f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28c6a2f4 4e245edf

rootdir/init.rc

+27 −26
Original line number Diff line number Diff line
@@ -90,32 +90,6 @@ on early-init 
    # checker programs.

    mkdir /dev/fscklogs 0770 root system



# 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_start boringssl_self_test32

on early-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



service boringssl_self_test32 /system/bin/boringssl_self_test32

    reboot_on_failure reboot,boringssl-self-check-failed

    stdio_to_kmsg



service boringssl_self_test64 /system/bin/boringssl_self_test64

    reboot_on_failure reboot,boringssl-self-check-failed

    stdio_to_kmsg



service boringssl_self_test_apex32 /apex/com.android.conscrypt/bin/boringssl_self_test32

    reboot_on_failure reboot,boringssl-self-check-failed

    stdio_to_kmsg



service boringssl_self_test_apex64 /apex/com.android.conscrypt/bin/boringssl_self_test64

    reboot_on_failure reboot,boringssl-self-check-failed

    stdio_to_kmsg



on init

    sysclktz 0
@@ -502,6 +476,33 @@ on init 
    start hwservicemanager

    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



service boringssl_self_test32 /system/bin/boringssl_self_test32

    reboot_on_failure reboot,boringssl-self-check-failed

    stdio_to_kmsg



service boringssl_self_test64 /system/bin/boringssl_self_test64

    reboot_on_failure reboot,boringssl-self-check-failed

    stdio_to_kmsg



service boringssl_self_test_apex32 /apex/com.android.conscrypt/bin/boringssl_self_test32

    reboot_on_failure reboot,boringssl-self-check-failed

    stdio_to_kmsg



service boringssl_self_test_apex64 /apex/com.android.conscrypt/bin/boringssl_self_test64

    reboot_on_failure reboot,boringssl-self-check-failed

    stdio_to_kmsg





# 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