Revert "Android: Use lint from cmdline-tools"
This reverts commit cce3bf4ac3463036d054929a78f94a0ddfeca4d0. Reason for revert: Looks like lint failure fails the compile step on android-archive-rel: https://ci.chromium.org/p/chromium/builders/ci/android-archive-rel/10732 Original change's description: > Android: Use lint from cmdline-tools > > This version of lint is up-to-date with Android Studio and the lint team > intends to keep it that way. > > We no longer need a separate tools-lint directory for an up-to-date > version of lint. > > Bug: 1069186 > Change-Id: I8846406c4787d36863718489c3c54c4b1438d79b > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2144367 > Auto-Submit: Peter Wen <wnwen@chromium.org> > Commit-Queue: Andrew Grieve <agrieve@chromium.org> > Reviewed-by: Andrew Grieve <agrieve@chromium.org> > Cr-Commit-Position: refs/heads/master@{#758085} TBR=wnwen@chromium.org,agrieve@chromium.org Change-Id: I9d6c6abfc06089372ef2bf6314bfa3d6ab0cb25e No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1069186 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2143786 Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org> Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#758104} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 7fe2944912e934b70a1938e04a46cb4ab2f15b0f
This commit is contained in:
Родитель
64b88349a0
Коммит
c122673827
|
@ -22,12 +22,6 @@ Still reading?
|
|||
Note: PRODUCT_DIR will be substituted at run-time with actual
|
||||
directory path (e.g. out/Debug)
|
||||
-->
|
||||
<issue id="AcceptsUserCertificates">
|
||||
<!-- See https://crbug.com/827265 and comment in the file for context. -->
|
||||
<ignore regexp="chrome/android/java/res/xml/network_security_config.xml"/>
|
||||
<ignore regexp="android_webview/tools/system_webview_shell/apk/res/xml/network_security_config.xml"/>
|
||||
<ignore regexp="test"/>
|
||||
</issue>
|
||||
<!-- AllowBackup defaults to true, and causes a lint warning if not explicitly set. -->
|
||||
<issue id="AllowBackup">
|
||||
<ignore path="AndroidManifest.xml"/>
|
||||
|
@ -38,7 +32,6 @@ Still reading?
|
|||
<issue id="Assert" severity="ignore"/>
|
||||
<issue id="AuthLeak" severity="Error">
|
||||
<ignore regexp="chrome/android/javatests"/>
|
||||
<ignore regexp="Test.java"/>
|
||||
</issue>
|
||||
<issue id="BadHostnameVerifier" severity="Error"/>
|
||||
<issue id="ButtonOrder" severity="Error">
|
||||
|
@ -173,12 +166,6 @@ Still reading?
|
|||
<ignore regexp="chrome/browser/ui/android/strings/ui_strings_grd"/>
|
||||
<ignore regexp="components/browser_ui/strings/android/browser_ui_strings_grd"/>
|
||||
</issue>
|
||||
<issue id="InsecureBaseConfiguration">
|
||||
<!-- See https://crbug.com/827265 and comment in the file for context. -->
|
||||
<ignore regexp="chrome/android/java/res/xml/network_security_config.xml"/>
|
||||
<ignore regexp="android_webview/tools/system_webview_shell/apk/res/xml/network_security_config.xml"/>
|
||||
<ignore regexp="test"/>
|
||||
</issue>
|
||||
<issue id="InconsistentArrays" severity="Error">
|
||||
<ignore regexp="android_webview/locale_paks.resources.zip/values/locale-paks.xml"/>
|
||||
<ignore regexp="chrome/android/chrome_locale_paks.resources.zip/values/locale-paks.xml"/>
|
||||
|
@ -292,10 +279,6 @@ Still reading?
|
|||
<issue id="OldTargetApi">
|
||||
<ignore path="AndroidManifest.xml"/>
|
||||
</issue>
|
||||
<issue id="OnClick">
|
||||
<!-- False positive, see: http://issuetracker.google.com/148523770 for similar issue. -->
|
||||
<ignore path="tools/android/audio_focus_grabber/java/res/layout/audio_focus_grabber_activity.xml"/>
|
||||
</issue>
|
||||
<issue id="Overdraw" severity="ignore"/>
|
||||
<issue id="PackageManagerGetSignatures">
|
||||
<ignore regexp="chrome/android/java/src/org/chromium/chrome/browser/browserservices/OriginVerifier.java"/>
|
||||
|
|
|
@ -862,7 +862,7 @@ if (enable_java_templates) {
|
|||
if (defined(invoker.min_sdk_version)) {
|
||||
_min_sdk_version = invoker.min_sdk_version
|
||||
}
|
||||
_lint_path = "$lint_android_sdk_root/cmdline-tools/latest/bin/lint"
|
||||
_lint_path = "$lint_android_sdk_root/tools-lint/bin/lint"
|
||||
_cache_dir = "$root_build_dir/android_lint_cache"
|
||||
_result_path = "$target_out_dir/$target_name/result.xml"
|
||||
_config_path = "$target_out_dir/$target_name/config.xml"
|
||||
|
@ -874,7 +874,6 @@ if (enable_java_templates) {
|
|||
script = "//build/android/gyp/lint.py"
|
||||
depfile = "$target_gen_dir/$target_name.d"
|
||||
inputs = [
|
||||
_lint_path,
|
||||
_platform_xml_path,
|
||||
_suppressions_file,
|
||||
]
|
||||
|
|
Загрузка…
Ссылка в новой задаче