commit 24f962bc8c9c0c8466e7d513bdd93e0c60e2532a
author sgjesse <sgjesse@google.com> Thu May 12 03:09:18 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Thu May 12 03:10:35 2022 -0700
tree 0f4ea661a6c3adafa31d93b9a6e702a81fedce08
parent 1e405417457210191a4f4b3a7ce7950720a16cc7

Ignore specific warning from library desugaring

PiperOrigin-RevId: 448201784

src/tools/android/java/com/google/devtools/build/android/r8/Desugar.java

diff --git a/src/tools/android/java/com/google/devtools/build/android/r8/Desugar.java b/src/tools/android/java/com/google/devtools/build/android/r8/Desugar.java
index a589398..606b05d 100644
--- a/src/tools/android/java/com/google/devtools/build/android/r8/Desugar.java
+++ b/src/tools/android/java/com/google/devtools/build/android/r8/Desugar.java
@@ -27,6 +27,7 @@
 import com.android.tools.r8.DiagnosticsHandler;
 import com.android.tools.r8.StringResource;
 import com.android.tools.r8.errors.InterfaceDesugarMissingTypeDiagnostic;
+import com.android.tools.r8.utils.StringDiagnostic;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.android.Converters.ExistingPathConverter;
 import com.google.devtools.build.android.Converters.PathConverter;
@@ -421,6 +422,15 @@
             DescriptorUtils.descriptorToBinaryName(
                 missingTypeDiagnostic.getMissingType().getDescriptor()));
       }
+      // TODO(b/232351017): Remove this again.
+      if (warning instanceof StringDiagnostic
+          && warning
+              .getDiagnosticMessage()
+              .contains(
+                  "Retargeting non final method Encoded method java.nio.channels.FileChannel")) {
+        // Ignore.
+        return;
+      }
       DiagnosticsHandler.super.warning(warning);
     }
   }