commit f5a04326d7b7a5b06eb763fbd9482804ef4801c1
author Christoffer Adamsen <christofferqa@google.com> Tue Mar 25 12:58:53 2025 +0000
committer Christoffer Adamsen <christofferqa@google.com> Tue Mar 25 05:59:51 2025 -0700
tree 3d6a501ee0a9f72fe8de7c8cde81194ec764b5b8
parent 2faab1a80024906d6c155fbaef5b32c8b2c5b44d

Do not create InterfaceMethodRewriter for API>=24 when not library desugaring

Change-Id: I4beba8de1877496af49e433d94ebe8f7eff87672

src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/LibraryDesugaringOptions.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/LibraryDesugaringOptions.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/LibraryDesugaringOptions.java
index 1a965ae..8c29cba 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/LibraryDesugaringOptions.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/LibraryDesugaringOptions.java
@@ -79,11 +79,11 @@
   }
 
   public boolean isCfToCfLibraryDesugaringEnabled() {
-    return !isLirToLirLibraryDesugaringEnabled();
+    return isEnabled() && !isLirToLirLibraryDesugaringEnabled();
   }
 
   public boolean isLirToLirLibraryDesugaringEnabled() {
-    return options.partialSubCompilationConfiguration != null;
+    return isEnabled() && options.partialSubCompilationConfiguration != null;
   }
 
   public void resetDesugaredLibrarySpecificationForTesting() {