1 files changed, 69 insertions, 0 deletions
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JillBasedToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JillBasedToolchain.java
new file mode 100644
index 0000000..dbcc528
--- /dev/null
+++ b/jack-tests/src/com/android/jack/test/toolchain/JillBasedToolchain.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.jack.test.toolchain;
+
+import com.android.jack.test.util.ExecFileException;
+import com.android.jack.test.util.ExecuteFile;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
+/**
+ * This {@link AndroidToolchain} uses Jill to convert legacy library format
+ * to dex format.
+ */
+public abstract class JillBasedToolchain extends JackCliToolchain {
+
+  @Nonnull
+  private File jillPrebuilt;
+
+  JillBasedToolchain(@Nonnull File jillPrebuilt, @Nonnull File jackPrebuilt) {
+    super(jackPrebuilt);
+    this.jillPrebuilt = jillPrebuilt;
+  }
+
+  protected void executeJill(@Nonnull File in, @Nonnull File out, boolean zipFiles) {
+    List<String> args = new ArrayList<String>();
+    args.add("java");
+    args.add("-jar");
+    args.add(jillPrebuilt.getAbsolutePath());
+    if (zipFiles) {
+      args.add("--container");
+      args.add("zip");
+    }
+    args.add(in.getAbsolutePath());
+    args.add("-o");
+    args.add(out.getAbsolutePath());
+
+    ExecuteFile execFile = new ExecuteFile(args.toArray(new String[args.size()]));
+    execFile.setOut(outRedirectStream);
+    execFile.setErr(errRedirectStream);
+    execFile.setVerbose(true);
+
+    try {
+      if (execFile.run() != 0) {
+        throw new RuntimeException("Jill exited with an error");
+      }
+    } catch (ExecFileException e) {
+      throw new RuntimeException("An error occured while running Jill", e);
+    }
+  }
+
+}