commit 9e639fa24833fa6722bfe9ba3ccba2dffc277d41
author Prashanth Swaminathan <prashanthsw@google.com> Fri Jun 02 22:52:10 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jun 07 17:10:00 2023
tree 86d94cf158e97dc518aa7fbbce594ef54bbe45a6
parent fc260a18786eb54300b05a4bcb389b23d69fb9df

Migrate Android NDK to CIPD [1/2]

The Android NDK dependency is moving to a CIPD bucket to reduce the
checkout cost and to eventually move to NDK v25. This introduces the
NDK into an 'android_toolchain' directory. Following the roll of
chromium/base in this repository, a second change will delete the old
'android_ndk' checkout. As a result, the checkout size of this
repository will temporarily increase.

This change also updates the license generation scripts and build
helpers to ensure the android_toolchain is also accounted for.

Bug: chromium:1448383
Test: Verified local builds of WebRTC.
Change-Id: Ibe667be241e5a454d884482061dd10b9850be25f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/307540
Commit-Queue: Prashanth Swaminathan <prashanthsw@google.com>
Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40239}

DEPS

diff --git a/DEPS b/DEPS
index 1e245d4..5106f5a 100644
--- a/DEPS
+++ b/DEPS
@@ -402,6 +402,17 @@
       'condition': 'checkout_android',
   },
 
+  'src/third_party/android_toolchain': {
+    'packages': [
+      {
+        'package': 'chromium/third_party/android_toolchain/r23c/android_toolchain',
+        'version': 'version:2@r23c.cr0',
+      },
+    ],
+    'condition': 'checkout_android',
+    'dep_type': 'cipd',
+  },
+
   'src/third_party/androidx': {
     'packages': [
       {

tools_webrtc/libs/generate_licenses.py

diff --git a/tools_webrtc/libs/generate_licenses.py b/tools_webrtc/libs/generate_licenses.py
index 2939af3..efec015 100755
--- a/tools_webrtc/libs/generate_licenses.py
+++ b/tools_webrtc/libs/generate_licenses.py
@@ -36,6 +36,7 @@
     'abseil-cpp': ['third_party/abseil-cpp/LICENSE'],
     'android_ndk': ['third_party/android_ndk/NOTICE'],
     'android_sdk': ['third_party/android_sdk/LICENSE'],
+    'android_toolchain': ['third_party/android_toolchain/NOTICE'],
     'auto': [
         'third_party/android_deps/libs/'
         'com_google_auto_service_auto_service/LICENSE'

tools_webrtc/presubmit_checks_lib/build_helpers.py

diff --git a/tools_webrtc/presubmit_checks_lib/build_helpers.py b/tools_webrtc/presubmit_checks_lib/build_helpers.py
index 3386d6d..159160c 100644
--- a/tools_webrtc/presubmit_checks_lib/build_helpers.py
+++ b/tools_webrtc/presubmit_checks_lib/build_helpers.py
@@ -81,6 +81,7 @@
 def GetClangTidyPath():
   """POC/WIP! Use the one we have, even it doesn't match clang's version."""
   tidy = ('third_party/android_ndk/toolchains/'
+          'third_party/android_toolchain/toolchains/'
           'llvm/prebuilt/linux-x86_64/bin/clang-tidy')
   return os.path.join(SRC_DIR, tidy)