diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2015-06-19 10:34:48 +0200 |
|---|---|---|
| committer | Benoit Lamarche <benoitlamarche@google.com> | 2015-06-19 10:34:48 +0200 |
| commit | b07b50cd26dceba9740991e7a92edcab888b8521 (patch) | |
| tree | 3008b8e0f831a42b6423516ac636dd54a1060aed | |
| parent | d16b6285320be7ac0450ed48ece7881078315782 (diff) | |
| download | toolchain_jill-b07b50cd26dceba9740991e7a92edcab888b8521.zip toolchain_jill-b07b50cd26dceba9740991e7a92edcab888b8521.tar.gz toolchain_jill-b07b50cd26dceba9740991e7a92edcab888b8521.tar.bz2 | |
Fix absolute paths with working directory
Change-Id: I97be8e1d066775a86b83ad2455bbbb3e0183080e
| -rw-r--r-- | jill/src/com/android/jill/Options.java | 4 |
1 files 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; |