diff options
author | Colin Cross <ccross@android.com> | 2017-02-23 10:06:34 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2017-02-23 10:29:10 -0800 |
commit | 9b81ac3526c315c63c5b3c124916852e141313e3 (patch) | |
tree | 79b706b5b1b93d291a6dc197a1320cf67cb63629 | |
parent | 2827552bc133e4bbbace2d76acb6cf1eda68cff9 (diff) | |
download | desugar-9b81ac3526c315c63c5b3c124916852e141313e3.tar.gz |
Revert "Delete temporary directory on exit"
This reverts commit 1b1d830f380bd7e1b05b8783e77305e3a91e4c98.
Replacing with merge from upstream:
I0eb3b59a25524e0e2dc1869da212861cdd8d3951
Test: none
Change-Id: I301ee33863b45d4e25b3df14ea21987a67127b81
-rw-r--r-- | java/com/google/devtools/build/android/desugar/Desugar.java | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/java/com/google/devtools/build/android/desugar/Desugar.java b/java/com/google/devtools/build/android/desugar/Desugar.java index 36c2041..3ea8a8b 100644 --- a/java/com/google/devtools/build/android/desugar/Desugar.java +++ b/java/com/google/devtools/build/android/desugar/Desugar.java @@ -27,12 +27,9 @@ import com.google.devtools.common.options.OptionsParser; import java.io.BufferedOutputStream; import java.io.IOException; import java.io.InputStream; -import java.nio.file.FileVisitResult; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; import java.util.Enumeration; import java.util.List; import java.util.Map; @@ -128,8 +125,6 @@ class Desugar { System.setProperty( LambdaClassMaker.LAMBDA_METAFACTORY_DUMPER_PROPERTY, dumpDirectory.toString()); - deleteTreeOnExit(dumpDirectory); - if (args.length == 1 && args[0].startsWith("@")) { args = Files.readAllLines(Paths.get(args[0].substring(1)), ISO_8859_1).toArray(new String[0]); } @@ -301,42 +296,4 @@ class Desugar { throw new ClassNotFoundException(); } } - - private static void deleteTreeOnExit(Path directory) { - Thread shutdownHook = - new Thread() { - @Override - public void run() { - try { - deleteTree(directory); - } catch (IOException e) { - throw new RuntimeException("Failed to delete " + directory, e); - } - } - }; - Runtime.getRuntime().addShutdownHook(shutdownHook); - } - - /** Recursively delete a directory. */ - private static void deleteTree(Path directory) throws IOException { - if (directory.toFile().exists()) { - Files.walkFileTree( - directory, - new SimpleFileVisitor<Path>() { - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) - throws IOException { - Files.delete(file); - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult postVisitDirectory(Path dir, IOException exc) - throws IOException { - Files.delete(dir); - return FileVisitResult.CONTINUE; - } - }); - } - } } |