From f99e0f4aa0ba2e18124cd32509da3d7e710dfbcb Mon Sep 17 00:00:00 2001 From: Prashanth Swaminathan Date: Fri, 2 Jun 2023 15:53:50 -0700 Subject: [PATCH] Remove stale Android NDK [2/2] Now that chromium/base has rolled and switched the android_ndk_root to the new android_toolchain directory, remove the stale Android NDK. Also update the license generation and build helper scripts to remove references to the previous NDK. Bug: chromium:1448383 Test: Verified build of WebRTC. Change-Id: Ic2b6009f454d67da60231bbcbb5c27bde8407ef3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/307541 Commit-Queue: Prashanth Swaminathan Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#40246} --- DEPS | 5 ----- tools_webrtc/libs/generate_licenses.py | 1 - tools_webrtc/presubmit_checks_lib/build_helpers.py | 3 +-- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/DEPS b/DEPS index 76726f46ec..d13f51f9d6 100644 --- a/DEPS +++ b/DEPS @@ -397,11 +397,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/android_ndk': { - 'url': 'https://chromium.googlesource.com/android_ndk.git@310956bd122ec2b96049f8d7398de6b717f3452e', - 'condition': 'checkout_android', - }, - 'src/third_party/android_toolchain': { 'packages': [ { diff --git a/tools_webrtc/libs/generate_licenses.py b/tools_webrtc/libs/generate_licenses.py index efec0156a8..835d988f7c 100755 --- a/tools_webrtc/libs/generate_licenses.py +++ b/tools_webrtc/libs/generate_licenses.py @@ -34,7 +34,6 @@ from html import escape # (right after the `third_party/` prefix) LIB_TO_LICENSES_DICT = { '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': [ diff --git a/tools_webrtc/presubmit_checks_lib/build_helpers.py b/tools_webrtc/presubmit_checks_lib/build_helpers.py index 159160c2ff..d64c2f457b 100644 --- a/tools_webrtc/presubmit_checks_lib/build_helpers.py +++ b/tools_webrtc/presubmit_checks_lib/build_helpers.py @@ -80,8 +80,7 @@ def RunNinjaCommand(args, root_dir=None): 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/' + tidy = ('third_party/android_toolchain/toolchains/' 'llvm/prebuilt/linux-x86_64/bin/clang-tidy') return os.path.join(SRC_DIR, tidy)