commit 6a4ab6d8c314d27e6cd4382be44daae2e936be07
author Søren Gjesse <sgjesse@google.com> Thu Nov 16 13:41:44 2023 +0100
committer Søren Gjesse <sgjesse@google.com> Thu Nov 16 13:21:47 2023 +0000
tree e68c4168782eb60799e1d960379f4703de7535ce
parent 3221721b3432b7ca7f155fabde74e13cc58597ab

Add dump info flag not print information on dump

Alos add a method for checking if desugared library is
used in the dump.

Change-Id: Ifcf0bd076dabbff077b03c6e7a6022cc93759b18

src/main/java/com/android/tools/r8/dex/ApplicationReader.java

diff --git a/src/main/java/com/android/tools/r8/dex/ApplicationReader.java b/src/main/java/com/android/tools/r8/dex/ApplicationReader.java
index 8232b0c..47f7ed6 100644
--- a/src/main/java/com/android/tools/r8/dex/ApplicationReader.java
+++ b/src/main/java/com/android/tools/r8/dex/ApplicationReader.java
@@ -169,7 +169,7 @@
     Diagnostic message = new StringDiagnostic("Dumped compilation inputs to: " + dumpOutput);
     if (dumpInputFlags.shouldFailCompilation()) {
       throw options.reporter.fatalError(message);
-    } else {
+    } else if (dumpInputFlags.shouldLogDumpInfoMessage()) {
       options.reporter.info(message);
     }
   }

src/main/java/com/android/tools/r8/dump/CompilerDump.java

diff --git a/src/main/java/com/android/tools/r8/dump/CompilerDump.java b/src/main/java/com/android/tools/r8/dump/CompilerDump.java
index 7655a6e..7febf31 100644
--- a/src/main/java/com/android/tools/r8/dump/CompilerDump.java
+++ b/src/main/java/com/android/tools/r8/dump/CompilerDump.java
@@ -45,6 +45,10 @@
     return directory.resolve("proguard.config");
   }
 
+  public boolean hasDesugaredLibrary() {
+    return Files.exists(directory.resolve("desugared-library.json"));
+  }
+
   public Path getDesugaredLibraryFile() {
     return directory.resolve("desugared-library.json");
   }

src/main/java/com/android/tools/r8/utils/DumpInputFlags.java

diff --git a/src/main/java/com/android/tools/r8/utils/DumpInputFlags.java b/src/main/java/com/android/tools/r8/utils/DumpInputFlags.java
index 368974b..da6b74e 100644
--- a/src/main/java/com/android/tools/r8/utils/DumpInputFlags.java
+++ b/src/main/java/com/android/tools/r8/utils/DumpInputFlags.java
@@ -46,6 +46,11 @@
       public boolean shouldFailCompilation() {
         throw new Unreachable();
       }
+
+      @Override
+      public boolean shouldLogDumpInfoMessage() {
+        throw new Unreachable();
+      }
     };
   }
 
@@ -85,6 +90,8 @@
 
   public abstract boolean shouldFailCompilation();
 
+  public abstract boolean shouldLogDumpInfoMessage();
+
   abstract static class DumpInputToFileOrDirectoryFlags extends DumpInputFlags {
 
     @Override
@@ -99,5 +106,10 @@
       }
       return true;
     }
+
+    @Override
+    public boolean shouldLogDumpInfoMessage() {
+      return true;
+    }
   }
 }