From b07b50cd26dceba9740991e7a92edcab888b8521 Mon Sep 17 00:00:00 2001
From: Benoit Lamarche <benoitlamarche@google.com>
Date: Fri, 19 Jun 2015 10:34:48 +0200
Subject: Fix absolute paths with working directory

Change-Id: I97be8e1d066775a86b83ad2455bbbb3e0183080e
---
 jill/src/com/android/jill/Options.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jill/src/com/android/jill/Options.java b/jill/src/com/android/jill/Options.java
index cfc4395..d759d24 100644
--- a/jill/src/com/android/jill/Options.java
+++ b/jill/src/com/android/jill/Options.java
@@ -91,7 +91,7 @@ public class Options {
   @Nonnull
   public File getOutput() {
     assert output != null;
-    if (workingDir != null) {
+    if (workingDir != null && !output.isAbsolute()) {
       return new File(workingDir, output.getPath());
     } else {
       return output;
@@ -101,7 +101,7 @@ public class Options {
   @Nonnull
   public File getBinaryFile() {
     assert binaryFile != null;
-    if (workingDir != null) {
+    if (workingDir != null && !binaryFile.isAbsolute()) {
       return new File(workingDir, binaryFile.getPath());
     } else {
       return binaryFile;
-- 
cgit v1.1