commit 927604fe611a65299d87193d2c11def9faac441f
author Christoffer Adamsen <christofferqa@google.com> Thu Feb 29 12:59:08 2024 +0000
committer Christoffer Adamsen <christofferqa@google.com> Thu Feb 29 12:59:08 2024 +0000
tree a12c23a5a5cf5486274ba726c2c108b764c432b4
parent ed30c3cedc5d5e32ef8fc38c88d95ac385991fea

Fix wrong MarkInstantiatedAction in resource shrinker

Change-Id: Ib4a5718865730c39902b45c664eb8e9b95c4473d

src/main/java/com/android/tools/r8/shaking/Enqueuer.java

diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index 3640796..c78d348 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -703,7 +703,11 @@
               .disallowMinification()
               .disallowRepackaging()
               .disallowOptimization());
-      markClassAsInstantiatedWithReason(clazz, reason);
+      if (clazz.isAnnotation() || clazz.isInterface()) {
+        markTypeAsLive(clazz, reason);
+      } else {
+        markClassAsInstantiatedWithReason(clazz, reason);
+      }
       for (ProgramMethod programInstanceInitializer : clazz.programInstanceInitializers()) {
         // TODO(b/325884671): Only keep the actually framework targeted constructors.
         applyMinimumKeepInfoWhenLiveOrTargeted(