diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-08-22 14:55:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-22 14:55:49 +0000 |
| commit | 64987f7fd5ec64bf042901ce0a8aa8d7777bd90d (patch) | |
| tree | f090be7c362a2c9c3be11307bc2ac78c47418e87 | |
| parent | 4a25ff3997898327247e930b13f0d7899149ec4e (diff) | |
| parent | cf045dba8aa75065e43ad0cfe90c831a7577188a (diff) | |
| download | boringssl-64987f7fd5ec64bf042901ce0a8aa8d7777bd90d.tar.gz | |
Merge "Run boringssl tests according to ro.zygote" into main am: 1767ca94e1 am: d837ddaba1 am: 18765019eb am: cf045dba8a
Original change: https://android-review.googlesource.com/c/platform/external/boringssl/+/2702594
Change-Id: I74ed72d1a10b4d18d80223c634049a0384d3d272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | selftest/Android.bp | 20 | ||||
| -rw-r--r-- | selftest/boringssl_self_test.rc | 5 | ||||
| -rw-r--r-- | selftest/boringssl_self_test.zygote64.rc | 2 | ||||
| -rw-r--r-- | selftest/boringssl_self_test.zygote64_32.rc | 4 |
4 files changed, 27 insertions, 4 deletions
diff --git a/selftest/Android.bp b/selftest/Android.bp index 013a128d..d746daf4 100644 --- a/selftest/Android.bp +++ b/selftest/Android.bp @@ -62,4 +62,24 @@ cc_binary { stem: "boringssl_self_test", vendor: true, init_rc: ["boringssl_self_test.rc"], + required: [ + "boringssl_self_test.zygote64.rc", + "boringssl_self_test.zygote64_32.rc", + ], +} + +prebuilt_etc { + name: "boringssl_self_test.zygote64_32.rc", + src: "boringssl_self_test.zygote64_32.rc", + vendor: true, + symlinks: [ + "boringssl_self_test.zygote32.rc", + "boringssl_self_test.no_zygote.rc", + ], +} + +prebuilt_etc { + name: "boringssl_self_test.zygote64.rc", + src: "boringssl_self_test.zygote64.rc", + vendor: true, } diff --git a/selftest/boringssl_self_test.rc b/selftest/boringssl_self_test.rc index 18e99add..2f20f802 100644 --- a/selftest/boringssl_self_test.rc +++ b/selftest/boringssl_self_test.rc @@ -1,8 +1,5 @@ # 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_vendor -on early-init && property:ro.product.cpu.abilist64=* - exec_start boringssl_self_test64_vendor +import /vendor/etc/boringssl_self_test.${ro.zygote}.rc service boringssl_self_test32_vendor /vendor/bin/boringssl_self_test32 setenv BORINGSSL_SELF_TEST_CREATE_FLAG true # Any nonempty value counts as true diff --git a/selftest/boringssl_self_test.zygote64.rc b/selftest/boringssl_self_test.zygote64.rc new file mode 100644 index 00000000..a6bbbe22 --- /dev/null +++ b/selftest/boringssl_self_test.zygote64.rc @@ -0,0 +1,2 @@ +on early-init && property:ro.product.cpu.abilist64=* + exec_start boringssl_self_test64_vendor diff --git a/selftest/boringssl_self_test.zygote64_32.rc b/selftest/boringssl_self_test.zygote64_32.rc new file mode 100644 index 00000000..6971bd52 --- /dev/null +++ b/selftest/boringssl_self_test.zygote64_32.rc @@ -0,0 +1,4 @@ +on early-init && property:ro.product.cpu.abilist32=* + exec_start boringssl_self_test32_vendor +on early-init && property:ro.product.cpu.abilist64=* + exec_start boringssl_self_test64_vendor |