Fix merge error and include missing fix
Bug: 147139686
Bug: 147472279
Bug: 147485959
Bug: 147480264
Change-Id: I32301691c2a5470d3d8ec6f1a2111d3be1c253ec
diff --git a/src/main/java/com/android/tools/r8/D8.java b/src/main/java/com/android/tools/r8/D8.java
index 5098368..15053ae 100644
--- a/src/main/java/com/android/tools/r8/D8.java
+++ b/src/main/java/com/android/tools/r8/D8.java
@@ -27,6 +27,7 @@
import com.android.tools.r8.utils.CfgPrinter;
import com.android.tools.r8.utils.ExceptionUtils;
import com.android.tools.r8.utils.InternalOptions;
+import com.android.tools.r8.utils.InternalOptions.DesugarState;
import com.android.tools.r8.utils.ThreadUtils;
import com.android.tools.r8.utils.Timing;
import com.google.common.collect.ImmutableList;
@@ -157,7 +158,9 @@
PrefixRewritingMapper rewritePrefix =
options.desugaredLibraryConfiguration.createPrefixRewritingMapper(options);
AppInfo appInfo =
- options.enableDesugaring ? new AppInfoWithClassHierarchy(app) : new AppInfo(app);
+ options.desugarState == DesugarState.ON
+ ? new AppInfoWithClassHierarchy(app)
+ : new AppInfo(app);
final CfgPrinter printer = options.printCfg ? new CfgPrinter() : null;
diff --git a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
index dbad10b..8c6e7c2 100644
--- a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
@@ -78,7 +78,7 @@
builder.setProgramConsumer(sink.wrapProgramConsumer(programConsumer));
builder.setMainDexListConsumer(mainDexListConsumer);
if (backend == Backend.DEX && defaultMinApiLevel != null) {
- assert builder.getMinApiLevel() == 0
+ assert !builder.isMinApiLevelSet()
: "Don't set the API level directly through BaseCompilerCommand.Builder in tests";
builder.setMinApiLevel(defaultMinApiLevel.getLevel());
}
