diff options
| author | Pete Bentley <prb@google.com> | 2023-10-09 14:23:00 +0100 |
|---|---|---|
| committer | Pete Bentley <prb@google.com> | 2023-10-09 13:56:45 +0000 |
| commit | 447dd2fa7a2cbc9f5149cf6a5dfe39515fa5ddb9 (patch) | |
| tree | 3605aa759a0f2c721b560d66c983520d7f035ec4 | |
| parent | 9f62ac7f4b17bfa68643321f3001f369ab923cb4 (diff) | |
| download | boringssl-447dd2fa7a2cbc9f5149cf6a5dfe39515fa5ddb9.tar.gz | |
Add support for 32bit break tests on Android.
Upstream CL: https://boringssl-review.googlesource.com/c/boringssl/+/63465
Test: N/A
Change-Id: I5ed3615d69e5644f74247a91726541f82f512932
| -rw-r--r-- | Android.bp | 9 | ||||
| -rwxr-xr-x | src/util/fipstools/break-tests.sh | 42 |
2 files changed, 35 insertions, 16 deletions
@@ -689,6 +689,15 @@ cc_test { cc_binary { name: "test_fips", host_supported: false, + compile_multilib: "both", + multilib: { + lib32: { + suffix: "32", + }, + lib64: { + suffix: "", + }, + }, defaults: [ "boringssl_flags", ], diff --git a/src/util/fipstools/break-tests.sh b/src/util/fipstools/break-tests.sh index 44ca2305..736d0664 100755 --- a/src/util/fipstools/break-tests.sh +++ b/src/util/fipstools/break-tests.sh @@ -46,20 +46,24 @@ inferred_mode() { fi } +MODE=`inferred_mode` # Prefer mode from command line if present. -case "$1" in - local|device) - MODE=$1 - ;; - - "") - MODE=`inferred_mode` - ;; - - *) - usage - ;; -esac +while [ "$1" ]; do + case "$1" in + local|device) + MODE=$1 + ;; + + "32") + TEST32BIT="true" + ;; + + *) + usage + ;; + esac + shift +done check_directory() { test -d "$1" || die "Directory $1 not found." @@ -145,10 +149,16 @@ else # Device mode test "$ANDROID_BUILD_TOP" || die "'lunch aosp_arm64-eng' first" check_directory "$ANDROID_PRODUCT_OUT" - TEST_FIPS_BIN="$ANDROID_PRODUCT_OUT/system/bin/test_fips" + if [ "$TEST32BIT" ]; then + TEST_FIPS_BIN="$ANDROID_PRODUCT_OUT/system/bin/test_fips32" + LIBCRYPTO_BIN="$ANDROID_PRODUCT_OUT/system/lib/libcrypto.so" + LIBCRYPTO_BREAK_BIN="$ANDROID_PRODUCT_OUT/system/lib/libcrypto_for_testing.so" + else + TEST_FIPS_BIN="$ANDROID_PRODUCT_OUT/system/bin/test_fips" + LIBCRYPTO_BIN="$ANDROID_PRODUCT_OUT/system/lib64/libcrypto.so" + LIBCRYPTO_BREAK_BIN="$ANDROID_PRODUCT_OUT/system/lib64/libcrypto_for_testing.so" + fi check_file "$TEST_FIPS_BIN" - LIBCRYPTO_BIN="$ANDROID_PRODUCT_OUT/system/lib64/libcrypto.so" - LIBCRYPTO_BREAK_BIN="$ANDROID_PRODUCT_OUT/system/lib64/libcrypto_for_testing.so" check_file "$LIBCRYPTO_BIN" check_file "$LIBCRYPTO_BREAK_BIN" |