Commit 78485ef1 authored by Justin Okamoto's avatar Justin Okamoto Committed by Commit Bot

Reland "Android: Allow per-target lint suppression configuration"

This is a reland of 1dd22ad0
Original change's description:
> Android: Allow per-target lint suppression configuration
> 
> This change allows for Android lint suppression configurations
> to be defined on a per-target basis (assuming said target is
> "Android lint capable") rather than having one global config.
> This will allow embedders to keep upstream's lint config for
> Chromium targets (w/o patching), while using a separate config
> for the embedding application.
> 
> Bug: 737897
> Change-Id: Ieccb95767e0ce541522d7a53edbe734c5bbfe6dc
> Reviewed-on: https://chromium-review.googlesource.com/698297
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#506393}

Bug: 737897
Change-Id: I4d1aecea7d4893f8f525d53a13b4044f27a17221
Reviewed-on: https://chromium-review.googlesource.com/701317Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506862}
parent 82f006f6
......@@ -397,6 +397,7 @@ Junchao Han <junchao.han@intel.com>
JungJik Lee <jungjik.lee@samsung.com>
Jungkee Song <jungkee.song@samsung.com>
Junmin Zhu <junmin.zhu@intel.com>
Justin Okamoto <justmoto@amazon.com>
Kai Jiang <jiangkai@gmail.com>
Kai Köhne <kai.koehne@qt.io>
Kal Conley <kcconley@gmail.com>
......
......@@ -748,7 +748,9 @@ if (enable_java_templates) {
deps = []
}
if (!defined(lint_suppressions_file)) {
if (defined(invoker.lint_suppressions_file)) {
lint_suppressions_file = invoker.lint_suppressions_file
} else if (!defined(lint_suppressions_file)) {
lint_suppressions_file = "//build/android/lint/suppressions.xml"
}
......@@ -2702,6 +2704,10 @@ if (enable_java_templates) {
if (_chromium_code) {
_has_lint_target = true
android_lint("${_template_name}__lint") {
if (defined(invoker.lint_suppressions_file)) {
lint_suppressions_file = invoker.lint_suppressions_file
}
android_manifest = _android_manifest
build_config = _build_config
......
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