commit 783ae722ed307a3b3782cd253fd4ffb387f38767
author Aaron Knobloch <aknobloch@google.com> Wed May 01 04:59:08 2024 +0000
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed May 01 21:57:24 2024 +0000
tree 30e8deaf3674b9681c3eed74027cb07898aeea0d
parent 2db0eb3f96a5756298dcd7f9319e56a98585bd10

[DEPS] Migrate from Chromium git to CIPD

The primary reason for this change is to resolve
https://crbug.com/boringssl/653. It has the side benefit of having much
more performant checkout times ( 1.5 mins to ~10 seconds locally).

Note that this change should be transparent to BoringSSL, but there
are some minor differences in the packages being pulled. Firstly,
we will not have Chromium-local changes. See the changelog here:

https://chromium.googlesource.com/android_ndk/+log

Additionally, this change goes from the base r23 to r23c.

Bug: crbug.com/boringssl/653
Test: Local checkout, then relying on infra
Change-Id: Id394eb254d00884c0e9aeb74c2103908c23fb8c3
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/68187
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>

util/bot/DEPS

diff --git a/util/bot/DEPS b/util/bot/DEPS
index b060ca4..0c95898 100644
--- a/util/bot/DEPS
+++ b/util/bot/DEPS
@@ -40,22 +40,19 @@
   'libcxxabi_revision': 'ec88f0ab262c5f2426dbf138b92ee9ae5961e431',
   'ninja_version': 'version:2@1.11.1.chromium.6',
 
-  # The Android NDK cannot be updated on CI for two reasons:
-  #
-  # Until https://crbug.com/boringssl/454 is fixed, we rely on an older NDK to
-  # test building without NEON instructions as the baseline.
-  #
-  # Until https://crbug.com/boringssl/653 is fixed, we cannot update past
-  # Chromium's version:2@r25c.cr0 package. Chromium has since switched building
-  # minimal CIPD packages which do not contain all the NDK files we need. We'll
-  # probably need to make our own NDK package.
-  'android_ndk_revision': '310956bd122ec2b96049f8d7398de6b717f3452e',
+  # The Android NDK cannot be updated until https://crbug.com/boringssl/454 is fixed.
+  # We rely on an older NDK to test building without NEON instructions as the baseline.
+  'android_ndk_revision': 'U0e8L6l52ySjBrUBB82Vdyhsg60vVMqH0ItTW3TRHAQC',
 }
 
 deps = {
   'boringssl/util/bot/android_ndk': {
-    'url': Var('chromium_git') + '/android_ndk.git' + '@' + Var('android_ndk_revision'),
+    'packages': [{
+      'package': 'infra/3pp/tools/android_ndk/linux-amd64',
+      'version': Var('android_ndk_revision'),
+    }],
     'condition': 'checkout_android',
+    'dep_type': 'cipd',
   },
 
   'boringssl/util/bot/android_sdk/public': {