Skip to content

Commit

Permalink
Revert "Android: Re-enable androidx custom lint checks"
Browse files Browse the repository at this point in the history
This reverts commit 12e8b3b.

Reason for revert: Suspected of breaking downstream compilation

Original change's description:
> Android: Re-enable androidx custom lint checks
>
> Androidx custom lint checks were disabled due to using newer APIs than
> the lint version we were using allowed. Now that we have updated to lint
> version 7.0.0, these checks are working again.
>
> The new --remove-fixed flag is also turned on in lint.py so that
> baseline.xml files do not keep growing but get trimmed when fixes are
> merged.
>
> Bug: 1225326, 1111416
> Fixed: 1225326
> Change-Id: I6b82c27a5b3f717137cdb5285718050b1ae532c6
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3200345
> Commit-Queue: Peter Wen <[email protected]>
> Reviewed-by: Mohamed Heikal <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#927831}

Bug: 1225326, 1111416, 1256477
Change-Id: I940f6e831f5bd2e6c528289f3d07330b03f60388
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3203528
Auto-Submit: Theresa  <[email protected]>
Owners-Override: Theresa  <[email protected]>
Commit-Queue: Rubber Stamper <[email protected]>
Bot-Commit: Rubber Stamper <[email protected]>
Cr-Commit-Position: refs/heads/main@{#927899}
  • Loading branch information
Theresa authored and Chromium LUCI CQ committed Oct 4, 2021
1 parent c6ad220 commit 1112da6
Show file tree
Hide file tree
Showing 4 changed files with 297 additions and 440 deletions.
7 changes: 4 additions & 3 deletions build/android/gyp/lint.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,6 @@ def _RunLint(lint_binary_path,

cmd = [
lint_binary_path,
# Uncomment to update baseline files during lint upgrades.
#'--update-baseline',
'--remove-fixed',
'--quiet', # Silences lint's "." progress updates.
'--disable',
','.join(_DISABLED_ALWAYS),
Expand Down Expand Up @@ -268,6 +265,10 @@ def _RunLint(lint_binary_path,
custom_annotation_zips = []
if aars:
for aar in aars:
# androidx custom lint checks require a newer version of lint. Disable
# until we update see https://crbug.com/1225326
if 'androidx' in aar:
continue
# Use relative source for aar files since they are not generated.
aar_dir = os.path.join(aar_root_dir,
os.path.splitext(_SrcRelative(aar))[0])
Expand Down
Loading

0 comments on commit 1112da6

Please sign in to comment.