Disable nonnull tracking in D8
Bug: 137168535
Change-Id: I2c3ca0c4ffaa986268f60ba686491d14402fca60
diff --git a/src/main/java/com/android/tools/r8/D8Command.java b/src/main/java/com/android/tools/r8/D8Command.java
index f427e0f..7cb5454 100644
--- a/src/main/java/com/android/tools/r8/D8Command.java
+++ b/src/main/java/com/android/tools/r8/D8Command.java
@@ -250,6 +250,7 @@
internal.minApiLevel = getMinApiLevel();
internal.intermediate = intermediate;
internal.readCompileTimeAnnotations = intermediate;
+
// Assert and fixup defaults.
assert !internal.isShrinking();
assert !internal.isMinifying();
@@ -269,6 +270,8 @@
assert !internal.enableLambdaMerging;
assert !internal.enableTreeShakingOfLibraryMethodOverrides;
+ // TODO(b/137168535) Disable non-null tracking for now.
+ internal.enableNonNullTracking = false;
internal.enableDesugaring = getEnableDesugaring();
internal.enableInheritanceClassInDexDistributor = isOptimizeMultidexForLinearAlloc();
// This is currently only used for testing.
