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}

DEPS

@@ -280,10 +280,6 @@ vars = {
   # and whatever else without interference from each other.
   'android_sdk_sources_version': '4gxhM8E62bvZpQs7Q3d0DinQaW0RLCIefhXrQBFkNy8C',
   # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling android_sdk_tools-lint_version
-  # and whatever else without interference from each other.
-  'android_sdk_tools-lint_version': '89hXqZYzCum3delB5RV7J_QyWkaRodqdtQS0s3LMh3wC',
-  # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
   'spv_tools_revision': '538512e8e8980cc01ab6501cd1cbd402d54f8491',
@@ -751,10 +747,6 @@ deps = {
               'package': 'chromium/third_party/android_sdk/public/sources/android-29',
               'version': Var('android_sdk_sources_version'),
           },
-          {
-              'package': 'chromium/third_party/android_sdk/public/tools-lint',
-              'version': Var('android_sdk_tools-lint_version'),
-          },
           {
               'package': 'chromium/third_party/android_sdk/public/cmdline-tools',
               'version': 'CR25ixsRhwuRnhdgDpGFyl9S0C_0HO9SUgFrwX46zq8C',

build/android/lint/suppressions.xml

@@ -22,6 +22,12 @@ 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"/>
@@ -32,6 +38,7 @@ 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">
@@ -166,6 +173,12 @@ 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"/>
@@ -279,6 +292,10 @@ 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"/>

build/config/android/internal_rules.gni

@@ -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/tools-lint/bin/lint"
+      _lint_path = "$lint_android_sdk_root/cmdline-tools/latest/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,6 +874,7 @@ 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,
       ]

third_party/android_sdk/README.chromium

@@ -7,7 +7,6 @@ Version: 29
   Android SDK Platform-tools 29.0.5
   Android SDK Platform API 29
   Android SDK Sources 29
-  Android Lint 26.4.0-alpha04
   Google Cloud Messaging 3
   SDK Patch Applier v4
 Security Critical: no
@@ -18,24 +17,10 @@ The Android SDK provide API libraries and developer tools necessary to
 build, test and debug for Android.
 
 Local Modifications:
-
 - public/
   - Added extras/chromium/.
-- public/tools-lint/
-  - Go to go/studio-master-grid
-  - Find the first green build under sdk_tools_linux
-  - Email tnorbye@google.com and cc android-devtools@ to determine if that build
-    can be used publicly.
-  - Click through to Artifacts.
-  - Click the copy icon at the right for sdk-repo-linux-tools-XXXXXXX.zip
-  - Use the copied command to download the zip.
-  - Unzip and rename tools to tools-lint and move to the right spot in our repo.
-  - Create CL and carbon copy tnorbye@google.com
-
-No other modifications has been made to the public Android SDK.
 
 Update Instructions:
-
 * public/tools/bin/sdkmanager --list  # Look for "Installed packages:"
 * For cmdline-tools run: sdkmanager --channel=3 'cmdline-tools;latest'
 * Prepare the CIPD yaml files for packages that need update and add them

third_party/android_sdk/cipd_tools-lint.yaml

-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# To create CIPD package run the following command.
-# cipd create --pkg-def cipd_tools-lint.yaml
-package: chromium/third_party/android_sdk/public/tools-lint
-description: tools-lint Android Lint
-root: public/
-data:
-  - dir: tools-lint
-# Some tools inspect their argv0 and don't handle CIPD's symlink structure
-# correctly. Install in copy mode so that they can find the other directories
-# relative to themselves.
-install_mode: copy