commit bfc6981a58b204665fdd5b48490d0124a67c29cc
author Søren Gjesse <sgjesse@google.com> Tue Jan 09 10:42:04 2018 +0100
committer Søren Gjesse <sgjesse@google.com> Wed Jan 10 12:18:54 2018 +0100
tree 735b399841a776232d9beeb001ef8b436cb0b409
parent 0e1ea4f22ad4326fb286493080ea6ba0e5a0c36b

Update D8 API use after breaking changes

Bug: 71733396
Test: m -j cts-tf-dalvik-buildutil (with with d8-master.jar in prebuilts/r8 updated)

(cherry picked from commit bec7511f95f05380c1f5718122cfd4b0baba6e4b)

Change-Id: I795c50b22dbf6829c553c05ae622117e20bb06f3
Merged-In: I508403c7804cb8a280dc466613ae43c38d47e0db

tools/vm-tests-tf/src/util/build/D8BuildStep.java

diff --git a/tools/vm-tests-tf/src/util/build/D8BuildStep.java b/tools/vm-tests-tf/src/util/build/D8BuildStep.java
index cd97dba..1e2c281 100644
--- a/tools/vm-tests-tf/src/util/build/D8BuildStep.java
+++ b/tools/vm-tests-tf/src/util/build/D8BuildStep.java
@@ -19,7 +19,7 @@
 import com.android.tools.r8.CompilationMode;
 import com.android.tools.r8.D8;
 import com.android.tools.r8.D8Command;
-import com.android.tools.r8.utils.OutputMode;
+import com.android.tools.r8.OutputMode;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -37,8 +37,7 @@
         D8Command.builder()
             .setMode(CompilationMode.DEBUG)
             .setMinApiLevel(1000)
-            .setEnableDesugaring(false)
-            .setOutputMode(OutputMode.Indexed);
+            .setEnableDesugaring(false);
   }
 
   @Override
@@ -46,7 +45,7 @@
 
     if (super.build()) {
       try {
-        builder.setOutputPath(Paths.get(outputFile.fileName.getAbsolutePath()));
+        builder.setOutput(Paths.get(outputFile.fileName.getAbsolutePath()), OutputMode.DexIndexed);
         Files.find(
                 Paths.get(inputFile.fileName.getAbsolutePath()),
                 1000,