From c4e089f755ce816d74d77d775d1428f8f5415c98 Mon Sep 17 00:00:00 2001 From: agrieve Date: Fri, 12 Aug 2016 19:42:02 -0700 Subject: [PATCH] Reland #2 of Fail builds when lint warnings are generated Previous: https://codereview.chromium.org/2236313004/ Reason for revert: If this fails again, please revert changes that introduce new warnings rather than this patch. TBR=estevenson@chromium.org,caseq@chromium.org BUG=607761 Review-Url: https://codereview.chromium.org/2241973002 Cr-Original-Commit-Position: refs/heads/master@{#411864} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: f8bde5d301337c0994a9d71fc31ed71b36a26e47 --- android/gyp/lint.py | 5 +- android/lint/suppressions.xml | 249 +++++++++++++++++++++++------- config/android/internal_rules.gni | 1 + 3 files changed, 196 insertions(+), 59 deletions(-) diff --git a/android/gyp/lint.py b/android/gyp/lint.py index bc09692a0..fb8805d82 100755 --- a/android/gyp/lint.py +++ b/android/gyp/lint.py @@ -331,7 +331,10 @@ def main(): else: input_paths.append(resource_source) - input_strings = [] + input_strings = [ + args.can_fail_build, + args.silent, + ] if args.android_sdk_version: input_strings.append(args.android_sdk_version) if args.processed_config_path: diff --git a/android/lint/suppressions.xml b/android/lint/suppressions.xml index 2111f9a5c..fa503d680 100644 --- a/android/lint/suppressions.xml +++ b/android/lint/suppressions.xml @@ -22,105 +22,238 @@ Still reading? directory path (e.g. out/Debug) --> - + + + + + + + + - - + + + + - + - - + + - + + + + - + + + + + - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + - + - + - - - - - - - - + + + + + + + + + + + + + - + - - - - - - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + - + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/android/internal_rules.gni b/config/android/internal_rules.gni index 539fbd7b9..b93c9d6e2 100644 --- a/config/android/internal_rules.gni +++ b/config/android/internal_rules.gni @@ -718,6 +718,7 @@ if (enable_java_templates) { "--classpath=@FileArg($_rebased_build_config:javac:interface_classpath)", "--resource-sources=@FileArg($_rebased_build_config:deps_info:owned_resources_dirs)", "--resource-sources=@FileArg($_rebased_build_config:deps_info:owned_resources_zips)", + "--can-fail-build", ] } }