commit 023eea8c447874db4df3a86776c1b9494901fafe
author Christoffer Adamsen <christofferqa@google.com> Thu May 04 10:48:35 2023 +0000
committer Christoffer Adamsen <christofferqa@google.com> Thu May 04 10:48:50 2023 +0000
tree 3be3b9fb3a8e32670486e95cb2efb34a3046ca4d
parent fc662698575e93818de2cdf4f1062c0c329bc559

Revert "Update Tivi dump to latest revision"

This reverts commit fa1c7bbfe18550acda5560cea2fe1ef91ee01c21.

Change-Id: I488fdd4c65e73d4e1002beaac833c6cb4869f49b

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 e220e0a..eef3dcf 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,9 +6,8 @@
 
 import static org.junit.Assume.assumeTrue;
 
-import com.android.tools.r8.LibraryDesugaringTestConfiguration;
 import com.android.tools.r8.R8TestBuilder;
-import com.android.tools.r8.StringResource;
+import com.android.tools.r8.R8TestCompileResult;
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
@@ -54,6 +53,20 @@
   }
 
   @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"))
@@ -61,6 +74,20 @@
         .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"))
@@ -72,11 +99,10 @@
         .allowDiagnosticMessages()
         .allowUnnecessaryDontWarnWildcards()
         .allowUnusedDontWarnPatterns()
-        .allowUnusedProguardConfigurationRules()
-        .enableCoreLibraryDesugaring(
-            LibraryDesugaringTestConfiguration.builder()
-                .addDesugaredLibraryConfiguration(
-                    StringResource.fromFile(outDirectory.resolve("desugared-library.json")))
-                .build());
+        .allowUnusedProguardConfigurationRules();
+  }
+
+  private void configureCf(R8TestBuilder<?> testBuilder) {
+    testBuilder.addOptionsModification(options -> options.horizontalClassMergerOptions().disable());
   }
 }

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 1c7e3a4..dc3e882 100644
--- a/third_party/opensource-apps/tivi.tar.gz.sha1
+++ b/third_party/opensource-apps/tivi.tar.gz.sha1
@@ -1 +1 @@
-97a01f49797a74321ad0181ae078f77d3b226d10
\ No newline at end of file
+b5b44fb38064e69308e980fd33651ce03a0b1977
\ No newline at end of file