commit c48624c79f291f3b14d61ca9916d59372271eb99
author Clément Béra <clementbera@google.com> Tue Dec 07 12:21:15 2021 +0000
committer Clément Béra <clementbera@google.com> Tue Dec 07 12:21:15 2021 +0000
tree 6e9821e6d8bfaa43eaa7a8d1ac4eb461f2088dc1
parent a50fcd75d7617f6a724672b296ea4f69ecfd7795

Disable retargeting in specific classes

Bug: 209365662
Change-Id: Ie5fcfb63f971709e14172779a54b20d3570d7215

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

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibraryRetargeter.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibraryRetargeter.java
index 5c6d6c1..01c504c 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibraryRetargeter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibraryRetargeter.java
@@ -128,6 +128,13 @@
     if (retargetLibraryMember.isEmpty() || !instruction.isInvoke()) {
       return NO_REWRITING;
     }
+    if (appView
+        .options()
+        .desugaredLibraryConfiguration
+        .getDontRetargetLibMember()
+        .contains(context.getContextType())) {
+      return NO_REWRITING;
+    }
     CfInvoke cfInvoke = instruction.asInvoke();
     DexMethod invokedMethod = cfInvoke.getMethod();
     InvokeRetargetingResult retarget =