diff options
author | mikaelpeltier <mikaelpeltier@google.com> | 2015-04-29 10:16:45 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-29 10:16:46 +0000 |
commit | f45c8cd2149bc5f124bfab6953b7db22d619b47c (patch) | |
tree | 96eb0f912dcedf793b21a38049480c8db147c7c7 /jack-tests/src/com/android | |
parent | 27d93f9d3f404a1007ea93325cecede04382037a (diff) | |
parent | f461483038c25fd6d84d70c5b62658f3ef809ccf (diff) | |
download | toolchain_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-tests/src/com/android')
-rw-r--r-- | jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java b/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java index 1a5a4c25..655e8fa1 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java +++ b/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java @@ -17,7 +17,7 @@ package com.android.jack.test.toolchain; import com.google.common.base.Splitter; -import com.google.common.io.Files; + import com.android.jack.Sourcelist; import com.android.jack.test.TestConfigurationException; @@ -28,6 +28,7 @@ import com.android.jack.test.runner.RuntimeRunnerFactory; import com.android.jack.test.util.ExecFileException; import com.android.jack.test.util.ExecuteFile; import com.android.jack.util.NamingTools; +import com.android.sched.util.file.Files; import com.android.sched.util.stream.ByteStreamSucker; import org.junit.Assume; @@ -333,7 +334,7 @@ public abstract class AbstractTestTools { assert src.isFile(); - Files.copy(src, dest); + com.google.common.io.Files.copy(src, dest); } } |