commit a969e5ab7996f6118fb387abbc5ea6d23e39e45d
author Morten Krogh-Jespersen <mkroghj@google.com> Tue Oct 25 09:51:21 2022 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Tue Oct 25 09:51:21 2022 +0200
tree 841b39e6106c38551de9eca225424c9f183328c7
parent 419cd759faebe5abdd2b03f6090a091416fd11fe

Fix building up allowrepackaging for program classes

Bug: b/250671873
Change-Id: Ic5cdf65066702c5385d765da34520efecb499dac

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

diff --git a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
index c80e7e7..9e1f28f 100644
--- a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
+++ b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
@@ -1639,8 +1639,7 @@
       if (appView.options().isMinificationEnabled() && !modifiers.allowsObfuscation) {
         dependentMinimumKeepInfo
             .getOrCreateMinimumKeepInfoFor(preconditionEvent, item.getReference())
-            .disallowMinification()
-            .applyIf(item.isProgramClass(), joiner -> joiner.asClassJoiner().disallowRepackaging());
+            .disallowMinification();
         context.markAsUsed();
       }