Remove redundant PRESUBMIT.py files.
* tools_webrtc/PRESUBMIT.py is only checking the licence which is already done here:
38f35db4d4:PRESUBMIT.py;l=913;bpv=1;bpt=0;drc=4fc9bd9f69a0d88889d86d0cc9f8e27406e8a342
* sdk/android/PRESUBMIT.py was added before 'git cl format' was required from the root PRESUBMIT.py:
https://codereview.webrtc.org/2377113003
Bug: webrtc:13895
Change-Id: Ia5ea2529c36ceebfd7d4e6a6a72352bd30c573b9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/257280
Reviewed-by: Christoffer Jansson <jansson@google.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#36391}
This commit is contained in:
parent
ac5cf78801
commit
4f279adb1b
@ -7,6 +7,3 @@ ssilkin@webrtc.org
|
||||
magjed@webrtc.org
|
||||
xalep@webrtc.org
|
||||
per-file ...Audio*.java=henrika@webrtc.org
|
||||
|
||||
per-file PRESUBMIT.py=jansson@webrtc.org
|
||||
per-file PRESUBMIT.py=jleconte@webrtc.org
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
|
||||
#
|
||||
# Use of this source code is governed by a BSD-style license
|
||||
# that can be found in the LICENSE file in the root of the source
|
||||
# tree. An additional intellectual property rights grant can be found
|
||||
# in the file PATENTS. All contributing project authors may
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
|
||||
def CheckChangeOnUpload(input_api, output_api):
|
||||
results = []
|
||||
results.extend(CheckPatchFormatted(input_api, output_api))
|
||||
return results
|
||||
|
||||
|
||||
def CheckPatchFormatted(input_api, output_api):
|
||||
import git_cl
|
||||
cmd = ['cl', 'format', '--dry-run', input_api.PresubmitLocalPath()]
|
||||
code, _ = git_cl.RunGitWithCode(cmd, suppress_stderr=True)
|
||||
if code == 2:
|
||||
short_path = input_api.basename(input_api.PresubmitLocalPath())
|
||||
full_path = input_api.os_path.relpath(
|
||||
input_api.PresubmitLocalPath(), input_api.change.RepositoryRoot())
|
||||
return [
|
||||
output_api.PresubmitPromptWarning(
|
||||
'The %s directory requires source formatting. '
|
||||
'Please run git cl format %s' % (short_path, full_path))
|
||||
]
|
||||
# As this is just a warning, ignore all other errors if the user
|
||||
# happens to have a broken clang-format, doesn't use git, etc etc.
|
||||
return []
|
||||
@ -1,55 +0,0 @@
|
||||
#!/usr/bin/env vpython3
|
||||
|
||||
# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
||||
#
|
||||
# Use of this source code is governed by a BSD-style license
|
||||
# that can be found in the LICENSE file in the root of the source
|
||||
# tree. An additional intellectual property rights grant can be found
|
||||
# in the file PATENTS. All contributing project authors may
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
# Runs PRESUBMIT.py in py3 mode by git cl presubmit.
|
||||
USE_PYTHON3 = True
|
||||
|
||||
|
||||
def _LicenseHeader(input_api):
|
||||
"""Returns the license header regexp."""
|
||||
# Accept any year number from 2003 to the current year
|
||||
current_year = int(input_api.time.strftime('%Y'))
|
||||
allowed_years = (str(s) for s in reversed(range(2003, current_year + 1)))
|
||||
years_re = '(' + '|'.join(allowed_years) + ')'
|
||||
license_header = (
|
||||
r'.*? Copyright( \(c\))? %(year)s The WebRTC [Pp]roject [Aa]uthors\. '
|
||||
r'All [Rr]ights [Rr]eserved\.\n'
|
||||
r'.*?\n'
|
||||
r'.*? Use of this source code is governed by a BSD-style license\n'
|
||||
r'.*? that can be found in the LICENSE file in the root of the source\n'
|
||||
r'.*? tree\. An additional intellectual property rights grant can be '
|
||||
r'found\n'
|
||||
r'.*? in the file PATENTS\. All contributing project authors may\n'
|
||||
r'.*? be found in the AUTHORS file in the root of the source tree\.\n'
|
||||
) % {
|
||||
'year': years_re,
|
||||
}
|
||||
return license_header
|
||||
|
||||
|
||||
def _CommonChecks(input_api, output_api):
|
||||
"""Checks common to both upload and commit."""
|
||||
results = []
|
||||
results.extend(
|
||||
input_api.canned_checks.CheckLicense(input_api, output_api,
|
||||
_LicenseHeader(input_api)))
|
||||
return results
|
||||
|
||||
|
||||
def CheckChangeOnUpload(input_api, output_api):
|
||||
results = []
|
||||
results.extend(_CommonChecks(input_api, output_api))
|
||||
return results
|
||||
|
||||
|
||||
def CheckChangeOnCommit(input_api, output_api):
|
||||
results = []
|
||||
results.extend(_CommonChecks(input_api, output_api))
|
||||
return results
|
||||
Loading…
x
Reference in New Issue
Block a user