commit da7c7e34ae957dda6d69f9d97e393e2c489f6a4b
author Christoffer Adamsen <christofferqa@google.com> Fri Mar 21 12:22:40 2025 +0000
committer Christoffer Adamsen <christofferqa@google.com> Mon Mar 24 02:49:06 2025 -0700
tree a6e62a5bc8629a2b57574e0cefe38ebd46d0077e
parent 05a06bdb851d3c286fb69dc83e956d7947da7a19

Account for library desugaring in D8 api modeling in R8 partial

Bug: b/391572031
Change-Id: I130e09599abf10f5fb108c80e106fb3f81e9f2d8

src/main/java/com/android/tools/r8/androidapi/AndroidApiReferenceLevelCache.java

diff --git a/src/main/java/com/android/tools/r8/androidapi/AndroidApiReferenceLevelCache.java b/src/main/java/com/android/tools/r8/androidapi/AndroidApiReferenceLevelCache.java
index a1535f5..2094b4f 100644
--- a/src/main/java/com/android/tools/r8/androidapi/AndroidApiReferenceLevelCache.java
+++ b/src/main/java/com/android/tools/r8/androidapi/AndroidApiReferenceLevelCache.java
@@ -102,7 +102,7 @@
     if (!ignoringDesugaredLibrary
         && appView
             .options()
-            .getLibraryDesugaringOptions()
+            .getSubCompilationLibraryDesugaringOptions()
             .getMachineDesugaredLibrarySpecification()
             .isContextTypeMaintainedOrRewritten(reference)) {
       // If we end up desugaring the reference, the library classes is bridged by j$ which is part