From c458e33cd18c4e4601cbeba7c615756c91d102ac Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Mon, 14 Sep 2015 19:50:38 +0300
Subject: [PATCH] Fix .java files compilation in android-compiler-plugin

---
 build.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index dbe83fb2a3a..6fcfa7e9bda 100644
--- a/build.xml
+++ b/build.xml
@@ -586,8 +586,9 @@
 
     <target name="android-compiler-plugin">
         <cleandir dir="${output}/classes/android-compiler-plugin"/>
-
-        <kotlinc output="${output}/classes/android-compiler-plugin" modulename="kotlin-android-compiler-plugin">
+        <javac2 destdir="${output}/classes/android-compiler-plugin" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
+            <withKotlin modulename="kotlin-android-compiler-plugin"/>
+            <skip pattern="kotlin/jvm/internal/.*"/>
             <src>
                 <pathelement path="plugins/android-compiler-plugin/src"/>
             </src>
@@ -597,7 +598,7 @@
                 <pathelement path="${bootstrap.runtime}"/>
                 <pathelement path="${bootstrap.reflect}"/>
             </classpath>
-        </kotlinc>
+        </javac2>
 
         <jar destfile="${kotlin-home}/lib/android-compiler-plugin.jar">
             <fileset dir="${output}/classes/android-compiler-plugin"/>