From 9aef5dc2ab2660722d6f4e3fa3d59be9ffb47fdc Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Tue, 22 May 2018 16:44:23 +0200 Subject: [PATCH] Disable owners check in PRESUBMIT.py for chromium owned 3pp deps. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:8366 Change-Id: I18a7117d13dfacc2b305c304037a0d3b55b6df3b Reviewed-on: https://webrtc-review.googlesource.com/78284 Commit-Queue: Artem Titov Reviewed-by: Patrik Höglund Cr-Commit-Position: refs/heads/master@{#23352} --- PRESUBMIT.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 37948dbdf8..7575948a2c 100755 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -852,9 +852,23 @@ def CheckChangeOnUpload(input_api, output_api): def CheckChangeOnCommit(input_api, output_api): results = [] + + # We have to skip OWNERS check for chromium-specific third_party deps. + chromium_deps_file = input_api.os_path.join( + input_api.PresubmitLocalPath(), + 'THIRD_PARTY_CHROMIUM_DEPS.json') + with open(chromium_deps_file, 'rb') as f: + chromium_deps = json.load(f).get('dependencies', []) + deps_blacklist = [] + for dep in chromium_deps: + deps_blacklist.append(r'^third_party[\\\/]%s[\\\/].+' % dep) + deps_filter = lambda x: input_api.FilterSourceFile( + x, black_list=deps_blacklist) + results.extend(CommonChecks(input_api, output_api)) results.extend(VerifyNativeApiHeadersListIsValid(input_api, output_api)) - results.extend(input_api.canned_checks.CheckOwners(input_api, output_api)) + results.extend(input_api.canned_checks.CheckOwners(input_api, output_api, + source_file_filter=deps_filter)) results.extend(input_api.canned_checks.CheckChangeWasUploaded( input_api, output_api)) results.extend(input_api.canned_checks.CheckChangeHasDescription(