From f632a907413e6c613f4bcdf3e8103d0e6e5a7d94 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Wed, 11 Mar 2015 08:29:07 +0300
Subject: [PATCH] Fix compiler settings for android-compiler-plugin

It's necessary to use bootstrap-compiler and runtime but new compiler in classpath when increasing ABI.

For example ABI was X, then we increase it to X':

- It compiles in Bootstrap (B) build with compiler that knows
  old ABI version, so compiled compiler (C1) will still have version X, but new
  runtime's version is X' (R1).

  So when we compile android-compiler-plugin each part has version X.

- Then project compiles by new compiler (C1)
  (that class-files have ABI version X, but it knows about X') in main build.
  Here compiled compiler (C2) will have X' version of class-files,
  either has runtime (R1) compiled on previous stage.

  On this step android-compiler-plugin will be compiled fine by C1 and with C2, R1.
---
 build.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 3720b2bc66d..ca883bdc774 100644
--- a/build.xml
+++ b/build.xml
@@ -656,16 +656,16 @@
     <target name="android-compiler-plugin">
         <cleandir dir="${output}/classes/android-compiler-plugin"/>
 
-        <new-kotlinc output="${output}/classes/android-compiler-plugin">
+        <kotlinc output="${output}/classes/android-compiler-plugin">
             <src>
-                <include name="plugins/android-compiler-plugin/src"/>
+                <pathelement path="plugins/android-compiler-plugin/src"/>
             </src>
-            <class-path>
+            <classpath>
                 <pathelement path="${idea.sdk}/core/intellij-core.jar"/>
                 <pathelement path="${kotlin-home}/lib/kotlin-compiler.jar"/>
-                <pathelement path="${kotlin-home}/lib/kotlin-runtime.jar"/>
-            </class-path>
-        </new-kotlinc>
+                <pathelement path="${bootstrap.runtime}"/>
+            </classpath>
+        </kotlinc>
 
         <jar destfile="${kotlin-home}/lib/android-compiler-plugin.jar">
             <fileset dir="${output}/classes/android-compiler-plugin"/>