Skip to content

Commit

Permalink
Android: Add baseline.xml to lint's input
Browse files Browse the repository at this point in the history
Changes to baseline.xml should trigger re-linting.

Bug: None
Change-Id: I03f8528e0eba540941eff2784533253c7789f9ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2314695
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791811}
  • Loading branch information
Peter Wen authored and Commit Bot committed Jul 27, 2020
1 parent 5c14c1c commit cc39837
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions build/config/android/internal_rules.gni
Original file line number Diff line number Diff line change
Expand Up @@ -1058,13 +1058,17 @@ if (enable_java_templates) {
"//build/android:prepare_android_lint_cache",
invoker.build_config_dep,
]
inputs += [ invoker.build_config ]
_rebased_build_config =
rebase_path(invoker.build_config, root_build_dir)

# TODO(wnwen): Remove this baseline once it is empty.
baseline = "//build/android/lint/baseline.xml"
_rebased_baseline = rebase_path(baseline, root_build_dir)
_baseline = "//build/android/lint/baseline.xml"
_rebased_baseline = rebase_path(_baseline, root_build_dir)

inputs += [
_baseline,
invoker.build_config,
]

args += [
"--manifest-path=@FileArg($_rebased_build_config:deps_info:lint_android_manifest)",
Expand Down

0 comments on commit cc39837

Please sign in to comment.