diff --git a/sdk/android/OWNERS b/sdk/android/OWNERS index d75ffde97b..890f642341 100644 --- a/sdk/android/OWNERS +++ b/sdk/android/OWNERS @@ -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 diff --git a/sdk/android/PRESUBMIT.py b/sdk/android/PRESUBMIT.py deleted file mode 100644 index 876a860510..0000000000 --- a/sdk/android/PRESUBMIT.py +++ /dev/null @@ -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 [] diff --git a/tools_webrtc/PRESUBMIT.py b/tools_webrtc/PRESUBMIT.py deleted file mode 100644 index 57d142e9d7..0000000000 --- a/tools_webrtc/PRESUBMIT.py +++ /dev/null @@ -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