infra: Bump android-21 to android-24 on CI I believe we still need to stay working on android-21, but google/benchmark doesn't compile before android-24. I don't believe there are any changes of interest for us between android-21 and android-24[*], so just testing at 24 seems easiest. [*] Searching around, the Rust getrandom crate's docs suggest that getrandom is available starting android-23. As I understand it, this is not quite right because Android devices rarely get their kernel updated, so it's not until android-28 when we can assume it, due to older devices getting dropped and getrandom being added to CTS. Bug: 383769319 Change-Id: I190b297b52c3eecdcf2cc131412d23abf40ea40e Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/85288 Commit-Queue: Xiangfei Ding <xfding@google.com> Auto-Submit: David Benjamin <davidben@google.com> Reviewed-by: Xiangfei Ding <xfding@google.com>
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index cb1e22f..39e2875 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg
@@ -21,7 +21,7 @@ cipd_version: "refs/heads/main" properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\"}" } execution_timeout_secs: 3600 caches { @@ -45,7 +45,7 @@ cipd_version: "refs/heads/main" properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" } execution_timeout_secs: 3600 caches { @@ -69,7 +69,7 @@ cipd_version: "refs/heads/main" properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\",\"OPENSSL_NO_ASM\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\",\"OPENSSL_NO_ASM\":\"1\"}" } execution_timeout_secs: 3600 caches { @@ -93,7 +93,7 @@ cipd_version: "refs/heads/main" properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"FIPS\":\"1\"}" } execution_timeout_secs: 3600 caches { @@ -117,7 +117,7 @@ cipd_version: "refs/heads/main" properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\",\"CMAKE_BUILD_TYPE\":\"Release\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"CMAKE_BUILD_TYPE\":\"Release\"}" } execution_timeout_secs: 3600 caches { @@ -141,7 +141,7 @@ cipd_version: "refs/heads/main" properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-21\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\"}" } execution_timeout_secs: 3600 caches { @@ -165,7 +165,7 @@ cipd_version: "refs/heads/main" properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_ARM_MODE\":\"arm\",\"ANDROID_PLATFORM\":\"android-21\",\"CMAKE_BUILD_TYPE\":\"Release\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_ARM_MODE\":\"arm\",\"ANDROID_PLATFORM\":\"android-24\",\"CMAKE_BUILD_TYPE\":\"Release\"}" } execution_timeout_secs: 3600 caches { @@ -189,7 +189,7 @@ cipd_version: "refs/heads/main" properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-21\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" } execution_timeout_secs: 3600 caches { @@ -213,7 +213,7 @@ cipd_version: "refs/heads/main" properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-21\",\"CMAKE_BUILD_TYPE\":\"Release\",\"CMAKE_CXX_FLAGS\":\"-DOPENSSL_NO_STATIC_NEON_FOR_TESTING=1\",\"CMAKE_C_FLAGS\":\"-DOPENSSL_NO_STATIC_NEON_FOR_TESTING=1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\",\"CMAKE_BUILD_TYPE\":\"Release\",\"CMAKE_CXX_FLAGS\":\"-DOPENSSL_NO_STATIC_NEON_FOR_TESTING=1\",\"CMAKE_C_FLAGS\":\"-DOPENSSL_NO_STATIC_NEON_FOR_TESTING=1\"}" } execution_timeout_secs: 3600 caches { @@ -1429,7 +1429,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\"}" } execution_timeout_secs: 3600 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1445,7 +1445,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\"}" properties_j: "run_ssl_tests:false" properties_j: "run_unit_tests:false" } @@ -1462,7 +1462,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" } execution_timeout_secs: 3600 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1478,7 +1478,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" properties_j: "run_ssl_tests:false" properties_j: "run_unit_tests:false" } @@ -1495,7 +1495,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\",\"OPENSSL_NO_ASM\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\",\"OPENSSL_NO_ASM\":\"1\"}" } execution_timeout_secs: 3600 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1511,7 +1511,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\",\"OPENSSL_NO_ASM\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\",\"OPENSSL_NO_ASM\":\"1\"}" properties_j: "run_ssl_tests:false" properties_j: "run_unit_tests:false" } @@ -1528,7 +1528,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"FIPS\":\"1\"}" } execution_timeout_secs: 3600 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1544,7 +1544,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"FIPS\":\"1\"}" properties_j: "run_ssl_tests:false" properties_j: "run_unit_tests:false" } @@ -1561,7 +1561,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\",\"CMAKE_BUILD_TYPE\":\"Release\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"CMAKE_BUILD_TYPE\":\"Release\"}" } execution_timeout_secs: 3600 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1577,7 +1577,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-21\",\"CMAKE_BUILD_TYPE\":\"Release\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"CMAKE_BUILD_TYPE\":\"Release\"}" properties_j: "run_ssl_tests:false" properties_j: "run_unit_tests:false" } @@ -1594,7 +1594,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-21\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\"}" } execution_timeout_secs: 3600 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1609,7 +1609,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_ARM_MODE\":\"arm\",\"ANDROID_PLATFORM\":\"android-21\",\"CMAKE_BUILD_TYPE\":\"Release\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_ARM_MODE\":\"arm\",\"ANDROID_PLATFORM\":\"android-24\",\"CMAKE_BUILD_TYPE\":\"Release\"}" } execution_timeout_secs: 3600 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1625,7 +1625,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_ARM_MODE\":\"arm\",\"ANDROID_PLATFORM\":\"android-21\",\"CMAKE_BUILD_TYPE\":\"Release\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_ARM_MODE\":\"arm\",\"ANDROID_PLATFORM\":\"android-24\",\"CMAKE_BUILD_TYPE\":\"Release\"}" properties_j: "run_ssl_tests:false" properties_j: "run_unit_tests:false" } @@ -1643,7 +1643,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-21\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\"}" properties_j: "run_ssl_tests:false" properties_j: "run_unit_tests:false" } @@ -1660,7 +1660,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-21\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" } execution_timeout_secs: 3600 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1676,7 +1676,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-21\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" properties_j: "run_ssl_tests:false" properties_j: "run_unit_tests:false" } @@ -1693,7 +1693,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-21\",\"CMAKE_BUILD_TYPE\":\"Release\",\"CMAKE_CXX_FLAGS\":\"-DOPENSSL_NO_STATIC_NEON_FOR_TESTING=1\",\"CMAKE_C_FLAGS\":\"-DOPENSSL_NO_STATIC_NEON_FOR_TESTING=1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\",\"CMAKE_BUILD_TYPE\":\"Release\",\"CMAKE_CXX_FLAGS\":\"-DOPENSSL_NO_STATIC_NEON_FOR_TESTING=1\",\"CMAKE_C_FLAGS\":\"-DOPENSSL_NO_STATIC_NEON_FOR_TESTING=1\"}" } execution_timeout_secs: 3600 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1709,7 +1709,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-21\",\"CMAKE_BUILD_TYPE\":\"Release\",\"CMAKE_CXX_FLAGS\":\"-DOPENSSL_NO_STATIC_NEON_FOR_TESTING=1\",\"CMAKE_C_FLAGS\":\"-DOPENSSL_NO_STATIC_NEON_FOR_TESTING=1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\",\"CMAKE_BUILD_TYPE\":\"Release\",\"CMAKE_CXX_FLAGS\":\"-DOPENSSL_NO_STATIC_NEON_FOR_TESTING=1\",\"CMAKE_C_FLAGS\":\"-DOPENSSL_NO_STATIC_NEON_FOR_TESTING=1\"}" properties_j: "run_ssl_tests:false" properties_j: "run_unit_tests:false" }
diff --git a/infra/config/main.star b/infra/config/main.star index 7ec18ef..dccedd4 100755 --- a/infra/config/main.star +++ b/infra/config/main.star
@@ -356,7 +356,7 @@ "android": True, "cmake_args": { "ANDROID_ABI": "arm64-v8a", - "ANDROID_PLATFORM": "android-21", + "ANDROID_PLATFORM": "android-24", }, }, ) @@ -371,7 +371,7 @@ "android": True, "cmake_args": { "ANDROID_ABI": "arm64-v8a", - "ANDROID_PLATFORM": "android-21", + "ANDROID_PLATFORM": "android-24", "CMAKE_BUILD_TYPE": "Release", }, }, @@ -387,7 +387,7 @@ "android": True, "cmake_args": { "ANDROID_ABI": "arm64-v8a", - "ANDROID_PLATFORM": "android-21", + "ANDROID_PLATFORM": "android-24", # FIPS mode on Android uses shared libraries. "BUILD_SHARED_LIBS": "1", "FIPS": "1", @@ -407,7 +407,7 @@ "cmake_args": { "OPENSSL_NO_ASM": "1", "ANDROID_ABI": "arm64-v8a", - "ANDROID_PLATFORM": "android-21", + "ANDROID_PLATFORM": "android-24", # FIPS mode on Android uses shared libraries. "BUILD_SHARED_LIBS": "1", "FIPS": "1", @@ -429,7 +429,7 @@ "android": True, "cmake_args": { "ANDROID_ABI": "arm64-v8a", - "ANDROID_PLATFORM": "android-21", + "ANDROID_PLATFORM": "android-24", "FIPS": "1", }, }, @@ -445,7 +445,7 @@ "android": True, "cmake_args": { "ANDROID_ABI": "armeabi-v7a", - "ANDROID_PLATFORM": "android-21", + "ANDROID_PLATFORM": "android-24", }, }, ) @@ -460,7 +460,7 @@ "android": True, "cmake_args": { "ANDROID_ABI": "armeabi-v7a", - "ANDROID_PLATFORM": "android-21", + "ANDROID_PLATFORM": "android-24", "CMAKE_BUILD_TYPE": "Release", # Although Android now requires NEON support, on one builder, we # ignore the |__ARM_NEON| preprocessor option, to keep testing @@ -482,7 +482,7 @@ "android": True, "cmake_args": { "ANDROID_ABI": "armeabi-v7a", - "ANDROID_PLATFORM": "android-21", + "ANDROID_PLATFORM": "android-24", # FIPS mode on Android uses shared libraries. "BUILD_SHARED_LIBS": "1", "FIPS": "1", @@ -500,7 +500,7 @@ "cmake_args": { "ANDROID_ABI": "armeabi-v7a", "ANDROID_ARM_MODE": "arm", - "ANDROID_PLATFORM": "android-21", + "ANDROID_PLATFORM": "android-24", "CMAKE_BUILD_TYPE": "Release", }, },