Commit 31880386 authored by Aiden Benner's avatar Aiden Benner Committed by Commit Bot

Fix regression where custom ErrorProne checks were not run

Fix bug where all custom ErrorProne checks were not running.
Introduced by:
https://chromium-review.googlesource.com/c/chromium/src/+/1252006/

Changing the jar wildcard from * to *.class excluded metadata
files generated by Autoservice which were needed to load
the custom ErrorProne checks.

This CL reverts that pattern change.

Bug: 904524
Change-Id: Id452f2d797872eb306fcd52be433128c8835e015
Reviewed-on: https://chromium-review.googlesource.com/c/1331877Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Reviewed-by: default avatarEric Stevenson <estevenson@chromium.org>
Commit-Queue: Aiden Benner <abenner@google.com>
Cr-Commit-Position: refs/heads/master@{#608436}
parent 4d10ddfc
......@@ -63,12 +63,12 @@ def Jar(class_files, classes_dir, jar_path, manifest_file=None,
def JarDirectory(classes_dir, jar_path, manifest_file=None, predicate=None,
provider_configurations=None, additional_files=None):
all_classes = sorted(build_utils.FindInDirectory(classes_dir, '*.class'))
all_files = sorted(build_utils.FindInDirectory(classes_dir, '*'))
if predicate:
all_classes = [
f for f in all_classes if predicate(os.path.relpath(f, classes_dir))]
all_files = [
f for f in all_files if predicate(os.path.relpath(f, classes_dir))]
Jar(all_classes, classes_dir, jar_path, manifest_file=manifest_file,
Jar(all_files, classes_dir, jar_path, manifest_file=manifest_file,
provider_configurations=provider_configurations,
additional_files=additional_files)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment