summaryrefslogtreecommitdiffstats
path: root/jack
diff options
context:
space:
mode:
authormikaelpeltier <mikaelpeltier@google.com>2015-04-29 10:16:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-29 10:16:46 +0000
commitf45c8cd2149bc5f124bfab6953b7db22d619b47c (patch)
tree96eb0f912dcedf793b21a38049480c8db147c7c7 /jack
parent27d93f9d3f404a1007ea93325cecede04382037a (diff)
parentf461483038c25fd6d84d70c5b62658f3ef809ccf (diff)
downloadtoolchain_jack-f45c8cd2149bc5f124bfab6953b7db22d619b47c.tar.gz
toolchain_jack-f45c8cd2149bc5f124bfab6953b7db22d619b47c.tar.bz2
toolchain_jack-f45c8cd2149bc5f124bfab6953b7db22d619b47c.zip
Merge "Add createTmpDir method throwing CannotCreateFileException" into ub-jack
Diffstat (limited to 'jack')
-rw-r--r--jack/src/com/android/jack/Options.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/jack/src/com/android/jack/Options.java b/jack/src/com/android/jack/Options.java
index 78005d2c..0af098c7 100644
--- a/jack/src/com/android/jack/Options.java
+++ b/jack/src/com/android/jack/Options.java
@@ -17,7 +17,6 @@
package com.android.jack;
import com.google.common.base.Joiner;
-import com.google.common.io.Files;
import com.android.jack.backend.dex.DexFileWriter;
import com.android.jack.backend.dex.MultiDexLegacy;
@@ -78,6 +77,7 @@ import com.android.sched.util.file.FileOrDirectory.ChangePermission;
import com.android.sched.util.file.FileOrDirectory.Existence;
import com.android.sched.util.file.FileOrDirectory.Permission;
import com.android.sched.util.file.FileUtils;
+import com.android.sched.util.file.Files;
import com.android.sched.util.file.NoSuchFileException;
import com.android.sched.util.file.NotDirectoryException;
import com.android.sched.util.file.OutputStreamFile;