<?xml version="1.0" encoding="UTF-8"?>
<project name="<%= @spec[:name] %>">
    <path id="android.antlibs">
        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
    </path>

    <taskdef name="setup"
        classname="com.android.ant.SetupTask"
        classpathref="android.antlibs" />

    <taskdef name="mirahc" classname="org.mirah.ant.Compile" />

    <!-- TODO: better support for mixed-source builds -->
    <target name="javac" description="Compiles R.java and other gen/ files.">
      <javac srcdir="gen" destdir="${classes}" 
             includeantruntime="false" failonerror="true" />
    </target>

    <target name="compile" depends="-resource-src, -aidl, javac"
            description="Compiles project's .mirah files into .class files">
           <mirahc src="${src}" dir="${src}" destdir="${classes}" 
                   classpath="${classpath}" />
    </target>

    <setup />
</project>

<?xml version="1.0" encoding="UTF-8"?>
<project name="<%= @spec[:name] %>">
    <path id="android.antlibs">
        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
    </path>

    <taskdef name="setup"
        classname="com.android.ant.SetupTask"
        classpathref="android.antlibs" />

    <taskdef name="mirahc" classname="org.mirah.ant.Compile" />

    <!-- TODO: better support for mixed-source builds -->
    <target name="javac" description="Compiles R.java and other gen/ files.">
      <javac srcdir="gen" destdir="${classes}" 
             includeantruntime="false" failonerror="true" />
    </target>

    <target name="compile" depends="-resource-src, -aidl, javac"
            description="Compiles project's .mirah files into .class files">
      <!-- TODO: mirahc task doesn't infer package correctly.
           <mirahc src="${src}" destdir="${classes}" 
           classpath="${classpath}" /> -->
      <exec executable="mirahc" dir="src" failonerror="true">
        <arg line="-c ${classpath}" />
        <arg line="-d ${classes}" />
        <arg value="." />
      </exec>
    </target>

    <setup />
</project>

Revert "Back to using the mirahc ant task."
Revert "Back to using the mirahc ant task."

The ant task still has classpath issues.

This reverts commit 977e1a155d69b144384fc8db7e124908d0995b69.
Reverting "Back to using the mirahc ant task."
