Fix ExceptionInInitializerError when running dex segments
Change-Id: I2dff032c35ffd63b4e83ea62e83530049a1b6ece
diff --git a/src/main/java/com/android/tools/r8/utils/DexVersion.java b/src/main/java/com/android/tools/r8/utils/DexVersion.java
index 604075f..f4ef4b2 100644
--- a/src/main/java/com/android/tools/r8/utils/DexVersion.java
+++ b/src/main/java/com/android/tools/r8/utils/DexVersion.java
@@ -70,10 +70,6 @@
return getDexVersion(androidApiLevel).dexVersion >= dexVersion;
}
- static {
- assert InternalOptions.containerDexApiLevel().isEqualTo(AndroidApiLevel.BAKLAVA);
- }
-
static final Map<AndroidApiLevel, DexVersion> apiLevelToDexVersion =
new ImmutableMap.Builder<AndroidApiLevel, DexVersion>()
// MAIN is an unknown higher api version we therefore choose the highest known version.
@@ -97,6 +93,10 @@
.put(AndroidApiLevel.M, DexVersion.V37)
.build();
+ static {
+ assert InternalOptions.containerDexApiLevel().isEqualTo(AndroidApiLevel.BAKLAVA);
+ }
+
public static DexVersion getDexVersion(AndroidApiLevel androidApiLevel) {
if (androidApiLevel.isLessThan(AndroidApiLevel.N)) {
return DexVersion.V35;