Minor fix, addressing review comment for previous CL.
Change-Id: I33d8d0ad6ed6839bdd6f29fd7a35001c3d943eaa
diff --git a/src/test/java/com/android/tools/r8/TestBase.java b/src/test/java/com/android/tools/r8/TestBase.java
index 8067b5c..80e407c 100644
--- a/src/test/java/com/android/tools/r8/TestBase.java
+++ b/src/test/java/com/android/tools/r8/TestBase.java
@@ -324,7 +324,7 @@
/** Compile an application with D8. */
protected AndroidApp compileWithD8(AndroidApp app, Consumer<InternalOptions> optionsConsumer)
- throws IOException {
+ throws IOException, CompilationFailedException {
return ToolHelper.runD8(app, optionsConsumer);
}
@@ -400,11 +400,7 @@
protected AndroidApp compileWithR8(
AndroidApp app, String proguardConfig, Consumer<InternalOptions> optionsConsumer)
throws IOException, CompilationFailedException {
- R8Command command =
- ToolHelper.prepareR8CommandBuilder(app)
- .addProguardConfiguration(ImmutableList.of(proguardConfig), Origin.unknown())
- .build();
- return ToolHelper.runR8(command, optionsConsumer);
+ return compileWithR8(app, proguardConfig, optionsConsumer, Backend.DEX);
}
/** Compile an application with R8 using the supplied proguard configuration and backend. */
