Make core-stubs-mini lib a .jack file

Bug: 18598018

Change-Id: Ie9142a534e15946652dcfe598b9f81241cba18da

4 files changed, 12 insertions, 9 deletions

diff --git a/build.xml b/build.xml
index 2dbc2b76..12c267e2 100644
--- a/build.xml
+++ b/build.xml
@@ -303,6 +303,7 @@
       <filelist dir="/" >
         <file name="${junit4.dist.dir}/${junit4.execname}"/>
         <file name="${core-stubs-mini.dist.dir}/${core-stubs-mini.libname}"/>
+        <file name="${core-stubs-mini.dist.dir}/${core-stubs-mini.jack.libname}"/>
         <file name="${dx-ref.dist.dir}/${dx-ref.libname}"/>
         <file name="${ddm-lib.dist.dir}/${ddm-lib.libname}"/>
         <file name="${ecj.dist.dir}/${ecj.libname}"/>
@@ -1095,6 +1096,7 @@
   <property name="core-stubs-mini.build.dir" value="${core-stubs-mini.dir}/build"/>
   <property name="core-stubs-mini.build.outdir" value="${core-stubs-mini.build.dir}/classes"/>
   <property name="core-stubs-mini.libname" value="core-stubs-mini.jar"/>
+  <property name="core-stubs-mini.jack.libname" value="core-stubs-mini.jack"/>
 
   <target name="core-stubs-mini-clean">
     <delete dir="${core-stubs-mini.build.dir}" />
@@ -1109,11 +1111,9 @@
     </fileset>
     <java jar="${jack.dist.dir}/${jack.execname}" fork="true" failonerror="true">
       <arg value="--output-jack"/>
-      <arg value="${core-stubs-mini.build.dir}/${core-stubs-mini.libname}"/>
+      <arg value="${core-stubs-mini.dist.dir}/${core-stubs-mini.jack.libname}"/>
       <arg value="${core-stubs-mini.dir}/src"/>
     </java>
-    <unzip src = "${core-stubs-mini.build.dir}/${core-stubs-mini.libname}"
-           dest = "${core-stubs-mini.build.outdir}" />
     <javac srcdir="${core-stubs-mini.dir}/src"
       destdir="${core-stubs-mini.build.outdir}"
       source="1.5" target="1.5" debug="true" includeantruntime="false"  includeDestClasses="false"/>
@@ -1123,6 +1123,7 @@
     <copy todir="${jack.libs.dir}" flatten="true">
       <filelist dir="/">
         <file name="${core-stubs-mini.dist.dir}/${core-stubs-mini.libname}"/>
+        <file name="${core-stubs-mini.dist.dir}/${core-stubs-mini.jack.libname}"/>
       </filelist>
     </copy>
   </target>
diff --git a/dexcomparator/testing/com/android/jack/dexcomparator/test/TestTools.java b/dexcomparator/testing/com/android/jack/dexcomparator/test/TestTools.java
index c7aff74d..adee09fe 100644
--- a/dexcomparator/testing/com/android/jack/dexcomparator/test/TestTools.java
+++ b/dexcomparator/testing/com/android/jack/dexcomparator/test/TestTools.java
@@ -30,7 +30,7 @@ public class TestTools {
   @Nonnull
   private static final File jackJar = new File("../jack/dist/jack.jar");
   @Nonnull
-  private static final File coreStubsMini = new File("../jack/libs/core-stubs-mini.jar");
+  private static final File coreStubsMini = new File("../jack/libs/core-stubs-mini.jack");
 
   public static void compileToDexWithJack(@Nonnull List<File> sources, @Nonnull File dex) {
     int size = 8 + sources.size();
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java
index 3e13d9e7..45a1a8a9 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java
@@ -125,7 +125,7 @@ public abstract class JackBasedToolchain extends AndroidToolchain {
   @Nonnull
   public File[] getDefaultBootClasspath() {
     return new File[] {new File(AbstractTestTools.getJackRootDir(),
-        "toolchain/jack/jack-tests/libs/core-stubs-mini.jar"), new File(
+        "toolchain/jack/jack-tests/libs/core-stubs-mini.jack"), new File(
         AbstractTestTools.getJackRootDir(),
         "toolchain/jack/jack-tests/prebuilts/junit4-targetdex-jack.zip")};
   }
diff --git a/jack/tests/com/android/jack/TestTools.java b/jack/tests/com/android/jack/TestTools.java
index 6bfe6f1b..f46ee942 100644
--- a/jack/tests/com/android/jack/TestTools.java
+++ b/jack/tests/com/android/jack/TestTools.java
@@ -339,13 +339,13 @@ public class TestTools {
   @Nonnull
   public static File[] getDefaultBootclasspath() {
     return new File[] {getFromAndroidTree(
-        "toolchain/jack/jack/libs/core-stubs-mini.jar")};
+        "toolchain/jack/jack/libs/core-stubs-mini.jack")};
   }
 
   @Nonnull
   public static String getDefaultBootclasspathString() {
     return getFromAndroidTree(
-        "toolchain/jack/jack/libs/core-stubs-mini.jar")
+        "toolchain/jack/jack/libs/core-stubs-mini.jack")
           .getAbsolutePath();
   }
 
@@ -1002,12 +1002,14 @@ public class TestTools {
     List<String> arguments = new ArrayList<String>(compilerArgs.ecjArguments);
     if (compilerArgs.classpath != null) {
       arguments.add("-classpath");
-      arguments.add(compilerArgs.classpath);
+      // TODO(jmhenaff): This hack will be removed as soon as TestTools will be removed
+      arguments.add(compilerArgs.classpath.replace("core-stubs-mini.jack", "core-stubs-mini.jar"));
     }
 
     if (compilerArgs.bootclasspath != null) {
       arguments.add("-bootclasspath");
-      arguments.add(compilerArgs.bootclasspath);
+      // TODO(jmhenaff): This hack will be removed as soon as TestTools will be removed
+      arguments.add(compilerArgs.bootclasspath.replace("core-stubs-mini.jack", "core-stubs-mini.jar"));
     }
     return arguments;
   }