Fix android-compiler-plugin build

This commit is contained in:
Yan Zhulanow
2015-02-05 15:56:44 +03:00
parent 1d9979b073
commit 328116cb1a
+9 -14
View File
@@ -649,22 +649,17 @@
<target name="android-compiler-plugin"> <target name="android-compiler-plugin">
<cleandir dir="${output}/classes/android-compiler-plugin"/> <cleandir dir="${output}/classes/android-compiler-plugin"/>
<javac2 destdir="${output}/classes/android-compiler-plugin" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
source="${java.target}" target="${java.target}"> <new-kotlinc output="${output}/classes/android-compiler-plugin">
<withKotlin externalannotations="${external.annotations.path}"/>
<src> <src>
<dirset dir="${basedir}/plugins"> <include name="plugins/android-compiler-plugin/src"/>
<include name="android-compiler-plugin/src"/>
</dirset>
</src> </src>
<compilerarg value="-Xlint:all"/> <class-path>
<classpath> <pathelement path="${idea.sdk}/core/intellij-core.jar"/>
<fileset dir="${basedir}/lib" includes="**/*.jar"/> <pathelement path="${kotlin-home}/lib/kotlin-compiler.jar"/>
<fileset dir="${idea.sdk}" includes="core/*.jar"/> <pathelement path="${bootstrap.runtime}"/>
<fileset dir="${kotlin-home}/lib" includes="kotlin-compiler.jar"/> </class-path>
<file file="${bootstrap.runtime}"/> </new-kotlinc>
</classpath>
</javac2>
<jar destfile="${kotlin-home}/lib/android-compiler-plugin.jar"> <jar destfile="${kotlin-home}/lib/android-compiler-plugin.jar">
<fileset dir="${output}/classes/android-compiler-plugin"/> <fileset dir="${output}/classes/android-compiler-plugin"/>