From 8a9b9820e5693e09c24e396c071e05db1815ece2 Mon Sep 17 00:00:00 2001 From: Pete Bentley Date: Mon, 9 May 2022 17:38:19 +0100 Subject: [PATCH] Remove setenvs when running boringssl_self_test. No longer needed as the code to generate flag files based on this environment variable is removed in Android 13. Bug: 231946889 Test: Build and boot, Change-Id: I8ce57619aa4d1e6457f3f864bf5e403f727c040c (cherry picked from commit ba830eb81b57f3a1e7be74978d435721b7724e46) Merged-In: I8ce57619aa4d1e6457f3f864bf5e403f727c040c --- rootdir/init.rc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index 0bd0e1d80..d01192fce 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -97,22 +97,18 @@ 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 - setenv BORINGSSL_SELF_TEST_CREATE_FLAG true # Any nonempty value counts as true reboot_on_failure reboot,boringssl-self-check-failed stdio_to_kmsg service boringssl_self_test64 /system/bin/boringssl_self_test64 - setenv BORINGSSL_SELF_TEST_CREATE_FLAG true # Any nonempty value counts as true reboot_on_failure reboot,boringssl-self-check-failed stdio_to_kmsg service boringssl_self_test_apex32 /apex/com.android.conscrypt/bin/boringssl_self_test32 - setenv BORINGSSL_SELF_TEST_CREATE_FLAG true # Any nonempty value counts as true reboot_on_failure reboot,boringssl-self-check-failed stdio_to_kmsg service boringssl_self_test_apex64 /apex/com.android.conscrypt/bin/boringssl_self_test64 - setenv BORINGSSL_SELF_TEST_CREATE_FLAG true # Any nonempty value counts as true reboot_on_failure reboot,boringssl-self-check-failed stdio_to_kmsg