commit 4667b25930ebdbe237fc7e161a54f686f1b37815
author Christoffer Quist Adamsen <christofferqa@google.com> Thu May 04 13:02:50 2023 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu May 04 13:02:50 2023 +0200
tree d01081bd28f112d5950e28e49150747ff9991ed4
parent b98d679889f2c1eaf3f29961617bbdd9a1f9afd3

Reland "Update Tivi dump to latest revision"

This reverts commit 023eea8c447874db4df3a86776c1b9494901fafe.

Change-Id: Ibd295398d2a17d6d6e1ce07d9eb3b45fd3ea5da4

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

diff --git a/src/main/java/com/android/tools/r8/dump/DumpOptions.java b/src/main/java/com/android/tools/r8/dump/DumpOptions.java
index 9779fcf..ae0ecd8 100644
--- a/src/main/java/com/android/tools/r8/dump/DumpOptions.java
+++ b/src/main/java/com/android/tools/r8/dump/DumpOptions.java
@@ -203,6 +203,9 @@
       case BACKEND_KEY:
         builder.setBackend(Backend.valueOf(value));
         return;
+      case ENABLE_MISSING_LIBRARY_API_MODELING:
+        builder.setEnableMissingLibraryApiModeling(Boolean.parseBoolean(value));
+        return;
       case TOOL_KEY:
         builder.setTool(Tool.valueOf(value));
         return;

src/test/java/com/android/tools/r8/benchmarks/appdumps/AppDumpBenchmarkBuilder.java

diff --git a/src/test/java/com/android/tools/r8/benchmarks/appdumps/AppDumpBenchmarkBuilder.java b/src/test/java/com/android/tools/r8/benchmarks/appdumps/AppDumpBenchmarkBuilder.java
index 57fa80d..57d23d8 100644
--- a/src/test/java/com/android/tools/r8/benchmarks/appdumps/AppDumpBenchmarkBuilder.java
+++ b/src/test/java/com/android/tools/r8/benchmarks/appdumps/AppDumpBenchmarkBuilder.java
@@ -159,6 +159,7 @@
                       .addLibraryFiles(dump.getLibraryArchive())
                       .addKeepRuleFiles(dump.getProguardConfigFile())
                       .setMinApi(dumpProperties.getMinApi())
+                      .allowUnnecessaryDontWarnWildcards()
                       .allowUnusedDontWarnPatterns()
                       .allowUnusedProguardConfigurationRules()
                       // TODO(b/222228826): Disallow unrecognized diagnostics and open interfaces.

src/test/java/com/android/tools/r8/internal/opensourceapps/TiviTest.java

diff --git a/src/test/java/com/android/tools/r8/internal/opensourceapps/TiviTest.java b/src/test/java/com/android/tools/r8/internal/opensourceapps/TiviTest.java
index eef3dcf..e220e0a 100644
--- a/src/test/java/com/android/tools/r8/internal/opensourceapps/TiviTest.java
+++ b/src/test/java/com/android/tools/r8/internal/opensourceapps/TiviTest.java
@@ -6,8 +6,9 @@
 
 import static org.junit.Assume.assumeTrue;
 
+import com.android.tools.r8.LibraryDesugaringTestConfiguration;
 import com.android.tools.r8.R8TestBuilder;
-import com.android.tools.r8.R8TestCompileResult;
+import com.android.tools.r8.StringResource;
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
@@ -53,20 +54,6 @@
   }
 
   @Test
-  public void testR8Recompilation() throws Exception {
-    R8TestCompileResult compileResult =
-        testForR8(Backend.CF)
-            .addProgramFiles(outDirectory.resolve("program.jar"))
-            .apply(this::configure)
-            .apply(this::configureCf)
-            .compile();
-    testForR8(Backend.DEX)
-        .addProgramFiles(compileResult.writeToZip())
-        .apply(this::configure)
-        .compile();
-  }
-
-  @Test
   public void testR8Compat() throws Exception {
     testForR8Compat(Backend.DEX)
         .addProgramFiles(outDirectory.resolve("program.jar"))
@@ -74,20 +61,6 @@
         .compile();
   }
 
-  @Test
-  public void testR8CompatRecompilation() throws Exception {
-    R8TestCompileResult compileResult =
-        testForR8Compat(Backend.CF)
-            .addProgramFiles(outDirectory.resolve("program.jar"))
-            .apply(this::configure)
-            .apply(this::configureCf)
-            .compile();
-    testForR8Compat(Backend.DEX)
-        .addProgramFiles(compileResult.writeToZip())
-        .apply(this::configure)
-        .compile();
-  }
-
   private void configure(R8TestBuilder<?> testBuilder) {
     testBuilder
         .addClasspathFiles(outDirectory.resolve("classpath.jar"))
@@ -99,10 +72,11 @@
         .allowDiagnosticMessages()
         .allowUnnecessaryDontWarnWildcards()
         .allowUnusedDontWarnPatterns()
-        .allowUnusedProguardConfigurationRules();
-  }
-
-  private void configureCf(R8TestBuilder<?> testBuilder) {
-    testBuilder.addOptionsModification(options -> options.horizontalClassMergerOptions().disable());
+        .allowUnusedProguardConfigurationRules()
+        .enableCoreLibraryDesugaring(
+            LibraryDesugaringTestConfiguration.builder()
+                .addDesugaredLibraryConfiguration(
+                    StringResource.fromFile(outDirectory.resolve("desugared-library.json")))
+                .build());
   }
 }

third_party/opensource-apps/tivi.tar.gz.sha1

diff --git a/third_party/opensource-apps/tivi.tar.gz.sha1 b/third_party/opensource-apps/tivi.tar.gz.sha1
index dc3e882..1c7e3a4 100644
--- a/third_party/opensource-apps/tivi.tar.gz.sha1
+++ b/third_party/opensource-apps/tivi.tar.gz.sha1
@@ -1 +1 @@
-b5b44fb38064e69308e980fd33651ce03a0b1977
\ No newline at end of file
+97a01f49797a74321ad0181ae078f77d3b226d10
\ No newline at end of file