Bump android-18 to android-21 on CI The new NDK drops android-18 support. CMake was automatically upgrading it, but run_android_test.go wasn't. > -- android-18 is unsupported. Using minimum supported version 21. This is a speculative fix for Android builders on CI. Change-Id: Ifabf3577e354d41d7bf5d2e2e11d71309a1b8980 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/83307 Auto-Submit: David Benjamin <davidben@google.com> Reviewed-by: Lily Chen <chlily@google.com> Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index 81a2ef1..7513a83 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg
@@ -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-18\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-21\"}" } 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-18\",\"CMAKE_BUILD_TYPE\":\"Release\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_ARM_MODE\":\"arm\",\"ANDROID_PLATFORM\":\"android-21\",\"CMAKE_BUILD_TYPE\":\"Release\"}" } 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-18\",\"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-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\"}" } execution_timeout_secs: 3600 caches { @@ -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-18\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-21\"}" } 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-18\",\"CMAKE_BUILD_TYPE\":\"Release\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_ARM_MODE\":\"arm\",\"ANDROID_PLATFORM\":\"android-21\",\"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-18\",\"CMAKE_BUILD_TYPE\":\"Release\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_ARM_MODE\":\"arm\",\"ANDROID_PLATFORM\":\"android-21\",\"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-18\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-21\"}" 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-18\",\"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-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\"}" } 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-18\",\"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-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: "run_ssl_tests:false" properties_j: "run_unit_tests:false" }
diff --git a/infra/config/main.star b/infra/config/main.star index daec62a..4e55684 100755 --- a/infra/config/main.star +++ b/infra/config/main.star
@@ -445,7 +445,7 @@ "android": True, "cmake_args": { "ANDROID_ABI": "armeabi-v7a", - "ANDROID_PLATFORM": "android-18", + "ANDROID_PLATFORM": "android-21", }, }, ) @@ -460,7 +460,7 @@ "android": True, "cmake_args": { "ANDROID_ABI": "armeabi-v7a", - "ANDROID_PLATFORM": "android-18", + "ANDROID_PLATFORM": "android-21", "CMAKE_BUILD_TYPE": "Release", # Although Android now requires NEON support, on one builder, we # ignore the |__ARM_NEON| preprocessor option, to keep testing @@ -500,7 +500,7 @@ "cmake_args": { "ANDROID_ABI": "armeabi-v7a", "ANDROID_ARM_MODE": "arm", - "ANDROID_PLATFORM": "android-18", + "ANDROID_PLATFORM": "android-21", "CMAKE_BUILD_TYPE": "Release", }, },