Update build tools.
I'm leaving libc++abi unupdated for now, because it depends on a newer
libc++ than Chromium has managed to update to just yet. (It looks like
Chromium is, for now, manually passing -D_LIBCPP_CONSTINIT=constinit.)
Probably easier to pick that up when the dust settles.
(When that happens, libc++abi will need to be built as C++20, but that's
fine because this is only used on bots.)
Change-Id: I2b7ae62b618b0e09863b4b38548be1b937fbe0d0
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/52646
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/util/bot/DEPS b/util/bot/DEPS
index 690a4a8..1efc55a 100644
--- a/util/bot/DEPS
+++ b/util/bot/DEPS
@@ -27,12 +27,12 @@
# infra/3pp/tools/cmake/linux-amd64
'cmake_version': 'version:2@3.23.1',
# infra/3pp/tools/go/linux-amd64
- 'go_version': 'version:2@1.17.2',
+ 'go_version': 'version:2@1.18.2',
# Update the following from
- # https://chromium.googlesource.com/chromium/src/+/master/DEPS
+ # https://chromium.googlesource.com/chromium/src/+/main/DEPS
'android_sdk_platform-tools_version': 'g7n_-r6yJd_SGRklujGB1wEt8iyr77FZTUJVS9w6O34C',
- 'android_ndk_revision': '401019bf85744311b26c88ced255cd53401af8b7',
+ 'android_ndk_revision': '8388a2be5421311dc75c5f937aae13d821a27f3d',
'libfuzzer_revision': 'debe7d2d1982e540fbd6bd78604bf001753f9e74',
'libcxx_revision': '79a2e924d96e2fc1e4b937c42efd08898fa472d7',
'libcxxabi_revision': '9b8228b4a9be26e0881f36089d9a8d62df851acc',
diff --git a/util/bot/UPDATING b/util/bot/UPDATING
index cff2608..1543ed6 100644
--- a/util/bot/UPDATING
+++ b/util/bot/UPDATING
@@ -12,10 +12,10 @@
update_clang.py: Set CLANG_REVISION and CLANG_SUB_REVISION to the values used in
Chromium, found at
- https://chromium.googlesource.com/chromium/src/+/master/tools/clang/scripts/update.py
+ https://chromium.googlesource.com/chromium/src/+/main/tools/clang/scripts/update.py
vs_toolchain.py: Update _GetDesiredVsToolchainHashes from Chromium, found at
- https://chromium.googlesource.com/chromium/src/+/master/build/vs_toolchain.py
+ https://chromium.googlesource.com/chromium/src/+/main/build/vs_toolchain.py
This may require taking other updates to that file. (Don't remove MSVC
versions if BoringSSL still needs to support them.)
@@ -26,7 +26,7 @@
nasm-win32.exe: Update to the appropriate release of NASM, found at
https://www.nasm.us/. Use the same version as Chromium, found at
- https://chromium.googlesource.com/chromium/src/+/master/third_party/nasm/README.chromium
+ https://chromium.googlesource.com/chromium/src/+/main/third_party/nasm/README.chromium
Extract nasm.exe from the download named nasm-VERSION-win64.zip.
The current revision is nasm-2.13.03-win64.zip.
diff --git a/util/bot/update_clang.py b/util/bot/update_clang.py
index 6d9f68b..59b0cad 100644
--- a/util/bot/update_clang.py
+++ b/util/bot/update_clang.py
@@ -28,7 +28,7 @@
# CLANG_REVISION and CLANG_SUB_REVISION determine the build of clang
# to use. These should be synced with tools/clang/scripts/update.py in
# Chromium.
-CLANG_REVISION = 'llvmorg-14-init-6722-g0fbd3aad'
+CLANG_REVISION = 'llvmorg-15-init-10168-gc2a7904a'
CLANG_SUB_REVISION = 2
PACKAGE_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION)
diff --git a/util/bot/vs_toolchain.py b/util/bot/vs_toolchain.py
index 09f407d..df4637f 100644
--- a/util/bot/vs_toolchain.py
+++ b/util/bot/vs_toolchain.py
@@ -68,9 +68,9 @@
# libraries.
return ['418b3076791776573a815eb298c8aa590307af63']
if version == '2019':
- # VS 2019 16.61 with 10.0.19041 SDK, and 10.0.20348 version of
- # d3dcompiler_47.dll, with ARM64 libraries and UWP support.
- return ['3bda71a11e']
+ # VS 2019 16.61 with 10.0.20348.0 SDK, 10.0.19041 version of Debuggers
+ # with ARM64 libraries and UWP support.
+ return ['1023ce2e82']
raise Exception('Unsupported VS version %s' % version)
