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

Commit 2eb7746e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Run boringssl tests according to ro.zygote" into main am: a2bac909 am: 052542d0 am: b97b7d7f am: 11cade2e

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



Change-Id: I78a5d1440e0d6d47fc3ff7bb82bb03bfcf61f445
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1e32ba80 11cade2e

rootdir/Android.bp

+18 −0
Original line number Diff line number Diff line
@@ -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",

    ],

}

rootdir/init.boringssl.zygote64.rc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
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

rootdir/init.boringssl.zygote64_32.rc

0 → 100644
+8 −0
Original line number Diff line number Diff line 
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

rootdir/init.rc

+1 −8
Original line number Diff line number Diff line
@@ -479,14 +479,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