commit 037f3904a7d5ad8de739e5097f05ca75f6875f99
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Dec 04 11:15:57 2019 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Dec 04 10:16:14 2019 +0000
tree 5b679c8e71f6c343498ccdffa1963b1400b21eb6
parent 25a1d25ba60f59f5d31c0c881f8f2ab023dd8f17

Fix not overwriting jar output with empty content in KotlinCompilerTool

Change-Id: I93367b0eae6508837a19085b499a467336d16583

src/test/java/com/android/tools/r8/KotlinCompilerTool.java

diff --git a/src/test/java/com/android/tools/r8/KotlinCompilerTool.java b/src/test/java/com/android/tools/r8/KotlinCompilerTool.java
index 268709d..90763af 100644
--- a/src/test/java/com/android/tools/r8/KotlinCompilerTool.java
+++ b/src/test/java/com/android/tools/r8/KotlinCompilerTool.java
@@ -13,7 +13,6 @@
 import com.android.tools.r8.TestRuntime.CfRuntime;
 import com.android.tools.r8.ToolHelper.ProcessResult;
 import com.android.tools.r8.utils.FileUtils;
-import com.android.tools.r8.utils.ZipUtils;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -98,7 +97,6 @@
   }
 
   private ProcessResult compileInternal(Path output) throws IOException {
-    Path outdir = Files.isDirectory(output) ? output : state.getNewTempFolder();
     List<String> cmdline = new ArrayList<>();
     cmdline.add(jdk.getJavaExecutable().toString());
     cmdline.add("-jar");
@@ -120,11 +118,6 @@
           .collect(Collectors.joining(isWindows() ? ";" : ":")));
     }
     ProcessBuilder builder = new ProcessBuilder(cmdline);
-    ProcessResult kotlincResult = ToolHelper.runProcess(builder);
-    if (FileUtils.isJarFile(output)) {
-      assert !outdir.equals(output);
-      ZipUtils.zip(output, outdir);
-    }
-    return kotlincResult;
+    return ToolHelper.runProcess(builder);
   }
 }