From 55fc6cf193744b480a784c5b9227a8787c3af369 Mon Sep 17 00:00:00 2001
From: Artem Titov <titovartem@google.com>
Date: Thu, 30 Jul 2020 13:18:06 +0200
Subject: [PATCH] Fix "Assignment had no effect." error during chromium roll.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove custom android warning suppression file because looks like it
is not used anymore.

Bug: None
Change-Id: I09f8936a5e82e42f3d0c1e21f20ff4812ce1b8ae
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180582
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31811}
---
 tools_webrtc/android/suppressions.xml | 61 ---------------------------
 webrtc.gni                            |  3 --
 2 files changed, 64 deletions(-)
 delete mode 100644 tools_webrtc/android/suppressions.xml

diff --git a/tools_webrtc/android/suppressions.xml b/tools_webrtc/android/suppressions.xml
deleted file mode 100644
index 87b9387c3b..0000000000
--- a/tools_webrtc/android/suppressions.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<lint>
-  <!-- These lint settings is for the Android linter that gets run by
-       lint_action.gypi on compile of WebRTC java code. All WebRTC java code
-       should lint cleanly for the issues below. -->
-  <!-- TODO(phoglund): make work with suppress.py or remove printout referring
-       to suppress.py. -->
-
-  <issue id="UseSparseArrays" severity="ignore"/>
-
-  <issue id="Registered" severity="ignore"/>
-  <issue id="MissingPermission" severity="ignore"/>
-  <issue id="ApplySharedPref" severity="ignore"/>
-  <issue id="UnusedResources" severity="ignore"/>
-  <issue id="IconColors" severity="ignore"/>
-  <issue id="IconDipSize" severity="ignore"/>
-  <issue id="IconDuplicatesConfig" severity="ignore"/>
-  <issue id="RelativeOverlap" severity="ignore"/>
-  <issue id="RtlCompat" severity="ignore"/>
-  <issue id="IconMissingDensityFolder" severity="ignore"/>
-  <issue id="OldTargetApi" severity="ignore"/>
-
-  <issue id="GoogleAppIndexingWarning" severity="ignore"/>
-  <issue id="MissingRegistered" severity="ignore"/>
-  <issue id="LintError">
-    <!-- We no longer supply class files to lint. -->
-    <ignore regexp="No `.class` files were found in project"/>
-  </issue>
-  <!-- These are just from the dummy AndroidManifest.xml we use for linting.
-       It's in the same directory as this file. -->
-  <issue id="MissingApplicationIcon" severity="ignore"/>
-  <issue id="AllowBackup" severity="ignore"/>
-  <issue id="MissingVersion" severity="ignore"/>
-
-  <!-- Ignore all lint errors in Chromium code. -->
-  <issue id="all">
-    <ignore path="**/org/chromium/**/*.java" />
-  </issue>
-
-  <issue id="UsesMinSdkAttributes">
-    <!-- TODO(oprypin): find a way to disable this warning just for Chromium's
-         code, not globally. Due to https://cs.chromium.org/lint_manifest_path
-         it is impossible to discern paths of AndroidManifest.xml files.-->
-    <ignore path="AndroidManifest.xml" />
-  </issue>
-
-  <issue id="NewApi">
-    <!-- This is rewritten by desugar after lint runs. -->
-    <ignore regexp="Call requires API level 19.*`java.util.Objects#requireNonNull`"/>
-    <!-- AutoCloseable has been available since API 15, just hidden. -->
-    <ignore regexp="Class requires API level 19.*java.lang.AutoCloseable"/>
-    <ignore regexp="Call requires API level 19.*java.lang.AutoCloseable#close"/>
-    <!-- We support try-with-resources via desugar. -->
-    <ignore regexp="Try-with-resources requires API level 19"/>
-    <ignore regexp="Call requires API level 19.*`java.lang.Throwable#addSuppressed`"/>
-    <!-- We support new language features via desugar. -->
-    <ignore regexp="Default method requires API level 24"/>
-    <ignore regexp="Static interface  method requires API level 24"/>
-  </issue>
-
-</lint>
diff --git a/webrtc.gni b/webrtc.gni
index 95154709fe..17a66f974c 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -1074,9 +1074,6 @@ if (is_android) {
       errorprone_args = []
       errorprone_args += [ "-Werror" ]
 
-      # Use WebRTC-specific android lint suppressions file.
-      lint_suppressions_file = "//tools_webrtc/android/suppressions.xml"
-
       if (!defined(deps)) {
         deps = []
       }