commit fa1c7bbfe18550acda5560cea2fe1ef91ee01c21
author Christoffer Quist Adamsen <christofferqa@google.com> Wed May 03 16:31:54 2023 +0200
committer Christoffer Adamsen <christofferqa@google.com> Thu May 04 06:56:36 2023 +0000
tree 73bd9d4772254cae05f3708a9ec4843d31042900
parent cbb9d8591604de1e215a9e30122cd224e1de4bca

Update Tivi dump to latest revision

Contents of README.google:

Name: Tivi
URL: https://github.com/chrisbanes/tivi
Version: NA
Revision: 2e02ff35d13e5bee9a5b9b5d9236c62fa4e7a96b
Date: May 3, 2023
License: Apache License 2.0
Change-Id: I8ff379c045767786e42e546a22c3adea9b5aab41

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