Always trace all proto fields in tests
Change-Id: I7149d7b9590fa2bd5ed8aa1066536406c713aed8
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index c9a9165..c3df10f 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -160,7 +160,6 @@
protoShrinking.enableGeneratedMessageLiteShrinking = true;
protoShrinking.enableGeneratedMessageLiteBuilderShrinking = true;
protoShrinking.enableGeneratedExtensionRegistryShrinking = true;
- protoShrinking.traverseOneOfAndRepeatedProtoFields = false;
}
void disableAllOptimizations() {
@@ -1013,7 +1012,7 @@
public boolean enableGeneratedExtensionRegistryShrinking = false;
public boolean enableGeneratedMessageLiteShrinking = false;
public boolean enableGeneratedMessageLiteBuilderShrinking = false;
- public boolean traverseOneOfAndRepeatedProtoFields = true;
+ public boolean traverseOneOfAndRepeatedProtoFields = false;
public boolean isProtoShrinkingEnabled() {
return enableGeneratedExtensionRegistryShrinking
diff --git a/src/test/java/com/android/tools/r8/R8TestBuilder.java b/src/test/java/com/android/tools/r8/R8TestBuilder.java
index 1031845..569c222 100644
--- a/src/test/java/com/android/tools/r8/R8TestBuilder.java
+++ b/src/test/java/com/android/tools/r8/R8TestBuilder.java
@@ -428,6 +428,14 @@
}
public T enableProtoShrinking() {
+ return enableProtoShrinking(true);
+ }
+
+ public T enableProtoShrinking(boolean traverseOneOfAndRepeatedProtoFields) {
+ if (traverseOneOfAndRepeatedProtoFields) {
+ addOptionsModification(
+ options -> options.protoShrinking().traverseOneOfAndRepeatedProtoFields = true);
+ }
return addKeepRules("-shrinkunusedprotofields");
}