Remove PRESUBMIT.py check to scan for JSON manifests for Mojo.
Mojo manifests have been completely migrated from JSON to C++.
Bug: 895616
Change-Id: Ic32a2869ba01ae18735dc3502a8385bfd67bf7f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2154539
Reviewed-by: Ken Rockot <[email protected]>
Commit-Queue: Daniel Cheng <[email protected]>
Cr-Commit-Position: refs/heads/master@{#760768}
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 4db7b68..cdf322cd 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -2967,34 +2967,17 @@
# files and no *_messages*.h files, we should only nag about rules for
# *.mojom files.
for f in input_api.AffectedFiles(include_deletes=False):
- # Manifest files don't have a strong naming convention. Instead, scan
- # affected files for .json, .cc, and .h files which look like they contain
- # a manifest definition.
- if (f.LocalPath().endswith('.json') and
- not _MatchesFile(input_api,
- _KNOWN_TEST_DATA_AND_INVALID_JSON_FILE_PATTERNS,
- f.LocalPath())):
- json_comment_eater = _ImportJSONCommentEater(input_api)
- mostly_json_lines = '\n'.join(f.NewContents())
- # Comments aren't allowed in strict JSON, so filter them out.
- json_lines = json_comment_eater.Nom(mostly_json_lines)
- try:
- json_content = input_api.json.loads(json_lines)
- except:
- # There's another PRESUBMIT check that already verifies that JSON files
- # are not invalid, so no need to emit another warning here.
- continue
- if 'interface_provider_specs' in json_content:
+ # Manifest files don't have a strong naming convention. Instead, try to find
+ # affected .cc and .h files which look like they contain a manifest
+ # definition.
+ manifest_pattern = input_api.re.compile('manifests?\.(cc|h)$')
+ test_manifest_pattern = input_api.re.compile('test_manifests?\.(cc|h)')
+ if (manifest_pattern.search(f.LocalPath()) and not
+ test_manifest_pattern.search(f.LocalPath())):
+ # We expect all actual service manifest files to contain at least one
+ # qualified reference to service_manager::Manifest.
+ if 'service_manager::Manifest' in '\n'.join(f.NewContents()):
AddPatternToCheck(f, input_api.os_path.basename(f.LocalPath()))
- else:
- manifest_pattern = input_api.re.compile('manifests?\.(cc|h)$')
- test_manifest_pattern = input_api.re.compile('test_manifests?\.(cc|h)')
- if (manifest_pattern.search(f.LocalPath()) and not
- test_manifest_pattern.search(f.LocalPath())):
- # We expect all actual service manifest files to contain at least one
- # qualified reference to service_manager::Manifest.
- if 'service_manager::Manifest' in '\n'.join(f.NewContents()):
- AddPatternToCheck(f, input_api.os_path.basename(f.LocalPath()))
for pattern in file_patterns:
if input_api.fnmatch.fnmatch(
input_api.os_path.basename(f.LocalPath()), pattern):
