Version 2.0.67
Cherry pick: Update IfOnClassTest status
CL: https://r8-review.googlesource.com/c/r8/+/50365
Change-Id: Iaee3fb87050ac4e6a395fd30c9523853074f7ab2
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 3b19a4a..bbc8638 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
// This field is accessed from release scripts using simple pattern matching.
// Therefore, changing this field could break our release scripts.
- public static final String LABEL = "2.0.66";
+ public static final String LABEL = "2.0.67";
private Version() {
}
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnClassTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnClassTest.java
index 8c31345..50d64f8 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnClassTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnClassTest.java
@@ -217,6 +217,15 @@
return;
}
+ if (shrinker.isR8()) {
+ // The -keepclassmembers rule should not keep Dependent nor DependentUser since DependentUser
+ // is never referenced.
+ assertThat(codeInspector.clazz(EmptyMainClassForIfOnClassTests.class), isPresent());
+ assertThat(codeInspector.clazz(Precondition.class), isPresent());
+ assertEquals(2, codeInspector.allClasses().size());
+ return;
+ }
+
ClassSubject clazz = codeInspector.clazz(DependentUser.class);
assertThat(clazz, isRenamed());
MethodSubject m = clazz.method("void", "callFoo", ImmutableList.of());
@@ -355,5 +364,4 @@
FieldSubject f = clazz.field("int", "intField");
assertThat(f, isRenamed());
}
-
}
