commit 6b8949f7ea5eb896c6951989d48eea45676fdf11
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Sep 25 11:42:26 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 25 11:42:26 2018 +0000
tree d4d178407b5928f38a599536f13d35a759737800
parent 1ceec5260e4a260687ab76aa2de198b0122a6d82
parent 0fd73a61d4a87bd1c5e26265d26b885a77bf96b8

Merge "Fail gracefully with CompilationError if ASM throws"

src/main/java/com/android/tools/r8/ExtractMarker.java

diff --git a/src/main/java/com/android/tools/r8/ExtractMarker.java b/src/main/java/com/android/tools/r8/ExtractMarker.java
index 100105f..6fd04b6 100644
--- a/src/main/java/com/android/tools/r8/ExtractMarker.java
+++ b/src/main/java/com/android/tools/r8/ExtractMarker.java
@@ -121,7 +121,7 @@
             "Failed to read dex/vdex file `" + programFile + "`: '" + e.getMessage() + "'");
         continue;
       }
-      System.out.print("In file: " + cwd.relativize(programFile));
+      System.out.print("In file: " + cwd.toAbsolutePath().relativize(programFile.toAbsolutePath()));
       System.out.println(", " + extractDexSize(programFile) + " bytes:");
       for (Marker marker : markers) {
         if (marker == null) {