mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 13:50:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove stale Android NDK [2/2]

Browse source 
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 <prashanthsw@google.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40246}
This commit is contained in:
Prashanth Swaminathan 2023-06-02 15:53:50 -07:00 committed by WebRTC LUCI CQ
parent 40ad4ebfb5
commit f99e0f4aa0
3 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
DEPS
View file

@ -397,11 +397,6 @@ deps = {
'dep_type': 'cipd', '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': { 'src/third_party/android_toolchain': {
'packages': [ 'packages': [
{ {

1
tools_webrtc/libs/generate_licenses.py
View file

@ -34,7 +34,6 @@ from html import escape
# (right after the `third_party/` prefix) # (right after the `third_party/` prefix)
LIB_TO_LICENSES_DICT = { LIB_TO_LICENSES_DICT = {
'abseil-cpp': ['third_party/abseil-cpp/LICENSE'], 'abseil-cpp': ['third_party/abseil-cpp/LICENSE'],
'android_ndk': ['third_party/android_ndk/NOTICE'],
'android_sdk': ['third_party/android_sdk/LICENSE'], 'android_sdk': ['third_party/android_sdk/LICENSE'],
'android_toolchain': ['third_party/android_toolchain/NOTICE'], 'android_toolchain': ['third_party/android_toolchain/NOTICE'],
'auto': [ 'auto': [

3
tools_webrtc/presubmit_checks_lib/build_helpers.py
View file

@ -80,8 +80,7 @@ def RunNinjaCommand(args, root_dir=None):
def GetClangTidyPath(): def GetClangTidyPath():
"""POC/WIP! Use the one we have, even it doesn't match clang's version.""" """POC/WIP! Use the one we have, even it doesn't match clang's version."""
tidy = ('third_party/android_ndk/toolchains/' tidy = ('third_party/android_toolchain/toolchains/'
'third_party/android_toolchain/toolchains/'
'llvm/prebuilt/linux-x86_64/bin/clang-tidy') 'llvm/prebuilt/linux-x86_64/bin/clang-tidy')
return os.path.join(SRC_DIR, tidy) return os.path.join(SRC_DIR, tidy)