commit 7f7fd7927cbf1ae1da92f73ef25aab211d95fc04
author Søren Gjesse <sgjesse@google.com> Tue May 27 15:06:43 2025 +0200
committer Søren Gjesse <sgjesse@google.com> Tue May 27 06:08:26 2025 -0700
tree e84b94c4a5815faae49a4834c99743c33d0ced4f
parent d3f4b1d6f8da5eeff3957290b69339b84f0c7862

Version 8.10.28

Fix build issues after cherry-pick.

Change-Id: I0e751c7de1589bb15ee8bcdefbcef44126576a5e

src/main/java/com/android/tools/r8/Version.java

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 9c3ce76..05d3b0a 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -13,7 +13,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "8.10.27";
+  public static final String LABEL = "8.10.28";
 
   private Version() {
   }

src/test/testbase/java/com/android/tools/r8/TestBuilder.java

diff --git a/src/test/testbase/java/com/android/tools/r8/TestBuilder.java b/src/test/testbase/java/com/android/tools/r8/TestBuilder.java
index 294f719..f9fe490 100644
--- a/src/test/testbase/java/com/android/tools/r8/TestBuilder.java
+++ b/src/test/testbase/java/com/android/tools/r8/TestBuilder.java
@@ -96,6 +96,14 @@
     return self;
   }
 
+  public boolean isD8TestBuilder() {
+    return false;
+  }
+
+  public D8TestBuilder asD8TestBuilder() {
+    return null;
+  }
+
   public boolean isJvmTestBuilder() {
     return false;
   }

src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java

diff --git a/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java b/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java
index b5c886d..4b2502e 100644
--- a/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java
+++ b/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java
@@ -114,14 +114,6 @@
   LibraryDesugaringTestConfiguration libraryDesugaringTestConfiguration =
       LibraryDesugaringTestConfiguration.DISABLED;
 
-  public boolean isD8TestBuilder() {
-    return false;
-  }
-
-  public D8TestBuilder asD8TestBuilder() {
-    return null;
-  }
-
   public boolean isR8TestBuilder() {
     return false;
   }