Update Android NDK to r27d on CI Also include some notes on how to update it going forward. Fixed: 411628511 Change-Id: If48f9690245f928275ed6d3b334fbc52a84e9d91 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/79149 Commit-Queue: Lily Chen <chlily@google.com> Reviewed-by: Lily Chen <chlily@google.com> Auto-Submit: David Benjamin <davidben@google.com>
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index cd79afb..81a2ef1 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg
@@ -239,7 +239,6 @@ properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" properties_j: "android:true" properties_j: "cmake_args:{\"ANDROID_ABI\":\"riscv64\",\"ANDROID_PLATFORM\":\"android-35\",\"CMAKE_BUILD_TYPE\":\"Release\"}" - properties_j: "gclient_vars:{\"android_ndk_revision\":\"wC8sJjVPRDPTbaZFlki_qXTC1lWJNbJi8glUO0woJ1MC\"}" properties_j: "run_ssl_tests:false" properties_j: "run_unit_tests:false" } @@ -1729,7 +1728,6 @@ cipd_version: "refs/heads/main" properties_j: "android:true" properties_j: "cmake_args:{\"ANDROID_ABI\":\"riscv64\",\"ANDROID_PLATFORM\":\"android-35\",\"CMAKE_BUILD_TYPE\":\"Release\"}" - properties_j: "gclient_vars:{\"android_ndk_revision\":\"wC8sJjVPRDPTbaZFlki_qXTC1lWJNbJi8glUO0woJ1MC\"}" 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 1cba881..daec62a 100755 --- a/infra/config/main.star +++ b/infra/config/main.star
@@ -517,11 +517,6 @@ "ANDROID_PLATFORM": "android-35", "CMAKE_BUILD_TYPE": "Release", }, - # The default Android NDK cannot be updated until https://crbug.com/boringssl/454 is fixed. - # Meanwhile, RISC-V support requires a newer NDK, thus we override for this builder. - "gclient_vars": { - "android_ndk_revision": "wC8sJjVPRDPTbaZFlki_qXTC1lWJNbJi8glUO0woJ1MC", - }, "run_unit_tests": False, "run_ssl_tests": False, },
diff --git a/util/bot/DEPS b/util/bot/DEPS index 4d3356b..664f942 100644 --- a/util/bot/DEPS +++ b/util/bot/DEPS
@@ -30,6 +30,11 @@ # Run the following command to see the latest builds in CIPD: # cipd describe PACKAGE_NAME -version latest + # infra/3pp/tools/android_ndk/linux-amd64 + # This package does not get updates automatically. To update, bump the version + # in infra's 3pp/android_ndk/fetch.py (see https://crrev.com/c/6470969), then + # wait a few hours for the new package to be built. + 'android_ndk_version': 'version:3@r27d.chromium.1', # infra/3pp/tools/bazel_bootstrap/linux-amd64 # Keep this in sync with .bazelversion. 'bazel_version': 'version:3@7.5.0.chromium.1', @@ -39,6 +44,8 @@ 'go_version': 'version:3@1.25.1', # infra/3pp/tools/perl/windows-amd64 'perl_version': 'version:3@5.42.0.1', + # infra/3pp/tools/qemu_static/linux-amd64 + 'qemu_static_version': 'version:3@10.0.0+ds-1', # chrome_internal/third_party/sdk/windows, but if an update switches this to a # new major VS release, keep some bots at the older version. 'windows_sdk_version': 'uploaded:2024-01-11', @@ -60,18 +67,13 @@ # https://chromium.googlesource.com/chromium/src/tools/rust # and also ensure that `tools_clang_revision` above is up-to-date. 'tools_rust_revision': '0eaaeed1ca501e8beaf0c2d96528827d199dd346', - - # The Android NDK cannot be updated until https://crbug.com/42290318 is fixed. - # We rely on an older NDK to test building without NEON instructions as the baseline. - 'android_ndk_revision': 'U0e8L6l52ySjBrUBB82Vdyhsg60vVMqH0ItTW3TRHAQC', - 'qemu_static_version': 'gYNEUqCr-Tu1C_vBu68YFtN31hjjLe61dnI2AtuyEsYC', } deps = { 'boringssl/util/bot/android_ndk': { 'packages': [{ 'package': 'infra/3pp/tools/android_ndk/linux-amd64', - 'version': Var('android_ndk_revision'), + 'version': Var('android_ndk_version'), }], 'condition': 'checkout_android', 'dep_type': 'cipd',