Revert "Android: Allow per-target lint suppression configuration"
This reverts commit 1dd22ad042686bbf63b2f89efb466528cc682ffe. Reason for revert: Breaks when lint_suppressions_file is assigned within //build_overrides/build.gni 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} TBR=agrieve@chromium.org,justmoto@amazon.com Change-Id: Ib15a61731179cc9ffc8d415844cfe8fbbc8e68eb No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 737897 Reviewed-on: https://chromium-review.googlesource.com/701014 Reviewed-by: Andrew Grieve <agrieve@chromium.org> Commit-Queue: Andrew Grieve <agrieve@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#506475} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 2898491636d1bfc1bfddee39f07c7b8a6e1c6eb8
This commit is contained in:
Родитель
ad25758351
Коммит
04a557af6e
|
@ -761,9 +761,7 @@ if (enable_java_templates) {
|
|||
deps = []
|
||||
}
|
||||
|
||||
if (defined(invoker.lint_suppressions_file)) {
|
||||
lint_suppressions_file = invoker.lint_suppressions_file
|
||||
} else if (!defined(lint_suppressions_file)) {
|
||||
if (!defined(lint_suppressions_file)) {
|
||||
lint_suppressions_file = "//build/android/lint/suppressions.xml"
|
||||
}
|
||||
|
||||
|
@ -2712,7 +2710,6 @@ if (enable_java_templates) {
|
|||
if (_chromium_code) {
|
||||
_has_lint_target = true
|
||||
android_lint("${_template_name}__lint") {
|
||||
forward_variables_from(invoker, [ "lint_suppressions_file" ])
|
||||
android_manifest = _android_manifest
|
||||
build_config = _build_config
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче