commit 7038e7558f295669d7b22aab4b602787eafbabb9
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Apr 14 16:05:51 2023 +0200
committer Christoffer Adamsen <christofferqa@google.com> Fri Apr 14 14:06:24 2023 +0000
tree 33c352231e98e9041c082d44f2fc3377a0113fb5
parent cf5518104734593d3567d0764012915d78d60dbd

Set mandatory class type during keep rule construction in tests

Change-Id: Iea10c41986f23848f1f51a6964756ecfe1caaf1a

src/test/java/com/android/tools/r8/TestBase.java

diff --git a/src/test/java/com/android/tools/r8/TestBase.java b/src/test/java/com/android/tools/r8/TestBase.java
index 4adcef9..f3fc72a 100644
--- a/src/test/java/com/android/tools/r8/TestBase.java
+++ b/src/test/java/com/android/tools/r8/TestBase.java
@@ -58,6 +58,7 @@
 import com.android.tools.r8.shaking.NoHorizontalClassMergingRule;
 import com.android.tools.r8.shaking.NoVerticalClassMergingRule;
 import com.android.tools.r8.shaking.ProguardClassNameList;
+import com.android.tools.r8.shaking.ProguardClassType;
 import com.android.tools.r8.shaking.ProguardConfiguration;
 import com.android.tools.r8.shaking.ProguardConfigurationRule;
 import com.android.tools.r8.shaking.ProguardKeepAttributes;
@@ -910,6 +911,7 @@
     Builder keepRuleBuilder = ProguardKeepRule.builder();
     keepRuleBuilder.setSource("buildKeepRuleForClass " + clazz.getTypeName());
     keepRuleBuilder.setType(ProguardKeepRuleType.KEEP);
+    keepRuleBuilder.setClassType(ProguardClassType.CLASS);
     keepRuleBuilder.setClassNames(
         ProguardClassNameList.singletonList(
             ProguardTypeMatcher.create(
@@ -922,6 +924,7 @@
     Builder keepRuleBuilder = ProguardKeepRule.builder();
     keepRuleBuilder.setSource("buildKeepRuleForClassAndMethods " + clazz.getTypeName());
     keepRuleBuilder.setType(ProguardKeepRuleType.KEEP);
+    keepRuleBuilder.setClassType(ProguardClassType.CLASS);
     keepRuleBuilder.setClassNames(
         ProguardClassNameList.singletonList(
             ProguardTypeMatcher.create(