diff options
| author | Po-yao Chang <Po-yao.Chang@mediatek.com> | 2023-08-10 17:03:34 +0800 |
|---|---|---|
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-08-24 05:39:43 +0000 |
| commit | 690101432dea4904b5b5c414f0551186337da242 (patch) | |
| tree | ce00b1cb9bf20b642490f3e753c7c168c242105a | |
| parent | f7a44025588752a29e141d0b0b4bbd44f2269114 (diff) | |
| download | core-690101432dea4904b5b5c414f0551186337da242.tar.gz | |
Run boringssl tests according to ro.zygote
If ro.zygote is zygote64, don't bother running 32-bit test.
Otherwise abilist{32,64} decides what tests to run.
Bug: 291874369
Test: make gsi_arm64-user; Check /system/etc/init/hw
(cherry picked from https://android-review.googlesource.com/q/commit:6fe9367f7bb636d63a856d29944b4f229c3d01e2)
Merged-In: Id10b2242606d6400acc29c3174f713581d6cce2e
Change-Id: Id10b2242606d6400acc29c3174f713581d6cce2e
| -rw-r--r-- | rootdir/Android.bp | 18 | ||||
| -rw-r--r-- | rootdir/init.boringssl.zygote64.rc | 4 | ||||
| -rw-r--r-- | rootdir/init.boringssl.zygote64_32.rc | 8 | ||||
| -rw-r--r-- | rootdir/init.rc | 9 |
4 files changed, 31 insertions, 8 deletions
diff --git a/rootdir/Android.bp b/rootdir/Android.bp index e98733ada..c8a3cd61c 100644 --- a/rootdir/Android.bp +++ b/rootdir/Android.bp @@ -17,12 +17,30 @@ package { } 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", sub_dir: "init/hw", required: [ "fsverity_init", "platform-bootclasspath", + "init.boringssl.zygote64.rc", + "init.boringssl.zygote64_32.rc", ], } diff --git a/rootdir/init.boringssl.zygote64.rc b/rootdir/init.boringssl.zygote64.rc new file mode 100644 index 000000000..3f49fea8b --- /dev/null +++ b/rootdir/init.boringssl.zygote64.rc @@ -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 diff --git a/rootdir/init.boringssl.zygote64_32.rc b/rootdir/init.boringssl.zygote64_32.rc new file mode 100644 index 000000000..c0be42dbb --- /dev/null +++ b/rootdir/init.boringssl.zygote64_32.rc @@ -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 diff --git a/rootdir/init.rc b/rootdir/init.rc index 1e6918d00..9038ca234 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -481,14 +481,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 |