Fix missing redirections in JackApiToolchain

Change-Id: I6daa8205cf058ce4cac401dcfe525ca988d3312a

1 files changed, 35 insertions, 25 deletions

diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
index eb6d0cd..7bb7ff0 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
@@ -178,8 +178,6 @@ public class JackApiToolchain extends JackBasedToolchain {
   @Override
   @Nonnull
   public void libToExe(@Nonnull File in, @Nonnull File out, boolean zipFile) throws Exception {
-    System.setOut(outRedirectStream);
-    System.setErr(errRedirectStream);
 
     try {
       addProperties(properties, jackOptions);
@@ -207,6 +205,9 @@ public class JackApiToolchain extends JackBasedToolchain {
         jackOptions.setOutputDir(out);
       }
 
+      System.setOut(outRedirectStream);
+      System.setErr(errRedirectStream);
+
       Jack.run(jackOptions);
     } finally {
       System.setOut(stdOut);
@@ -217,37 +218,46 @@ public class JackApiToolchain extends JackBasedToolchain {
   @Override
   @Nonnull
   public void libToLib(@Nonnull File[] in, @Nonnull File out, boolean zipFiles) throws Exception {
-    addProperties(properties, jackOptions);
 
-    jackOptions.setJarjarRulesFile(jarjarRules);
+    try {
+      addProperties(properties, jackOptions);
 
-    if (jackOptions.getFlags() != null) {
-      jackOptions.applyShrobFlags();
-    }
+      jackOptions.setJarjarRulesFile(jarjarRules);
 
-    if (proguardFlags.size() > 0) {
-      jackOptions.setProguardFlagsFile(proguardFlags);
-    }
+      if (jackOptions.getFlags() != null) {
+        jackOptions.applyShrobFlags();
+      }
 
-    for (File res : resImport) {
-      jackOptions.addResource(res);
-    }
+      if (proguardFlags.size() > 0) {
+        jackOptions.setProguardFlagsFile(proguardFlags);
+      }
 
-    for (File staticLib : in) {
-      jackOptions.getJayceImport().add(staticLib);
-    }
+      for (File res : resImport) {
+        jackOptions.addResource(res);
+      }
 
-    for (File staticLib : staticLibs) {
-      jackOptions.getJayceImport().add(staticLib);
-    }
+      for (File staticLib : in) {
+        jackOptions.getJayceImport().add(staticLib);
+      }
 
-    if (zipFiles) {
-      jackOptions.setJayceOutputZip(out);
-    } else {
-      jackOptions.setJayceOutputDir(out);
-    }
+      for (File staticLib : staticLibs) {
+        jackOptions.getJayceImport().add(staticLib);
+      }
+
+      if (zipFiles) {
+        jackOptions.setJayceOutputZip(out);
+      } else {
+        jackOptions.setJayceOutputDir(out);
+      }
 
-    Jack.run(jackOptions);
+      System.setOut(outRedirectStream);
+      System.setErr(errRedirectStream);
+
+      Jack.run(jackOptions);
+    } finally {
+      System.setOut(stdOut);
+      System.setErr(stdErr);
+    }
   }
 
   @Nonnull