Avoid API level assert when irrelevant.
Change-Id: I3f2e16128506d56b67bf81c6f8c1f73f17a3231c
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/AtomicFieldUpdaterInstrumentor.java b/src/main/java/com/android/tools/r8/ir/optimize/AtomicFieldUpdaterInstrumentor.java
index 0ccfaba..cfd20f4 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/AtomicFieldUpdaterInstrumentor.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/AtomicFieldUpdaterInstrumentor.java
@@ -414,6 +414,9 @@
.setField(unsafeField)
.setAccessFlags(FieldAccessFlags.createPublicStaticFinalSynthetic())
.setApiLevel(appView.computedMinApiLevel())
+ // Avoid superfluous assert on API in the build call when API modeling is disabled.
+ .disableAndroidApiLevelCheckIf(
+ !appView.options().apiModelingOptions().isApiModelingEnabled())
.build();
builder.setStaticFields(ImmutableList.of(field));
var accessBuilder = FieldAccessInfoCollectionModifier.builder();
@@ -522,6 +525,9 @@
.setField(offsetField)
.setAccessFlags(FieldAccessFlags.createPublicStaticFinalSynthetic())
.setApiLevel(appView.computedMinApiLevel())
+ // Avoid superfluous API assert in build when API modeling is disabled.
+ .disableAndroidApiLevelCheckIf(
+ !appView.options().apiModelingOptions().isApiModelingEnabled())
.build();
}