From 6e961be1a11b5d868e9b63efe347f9dfba024fd8 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Fri, 7 Apr 2017 02:08:02 +0300
Subject: [PATCH] No need to fork ant under jdk8 to build annotation-processing

---
 build.xml | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/build.xml b/build.xml
index 3ceab9bac22..c6a96c57dad 100644
--- a/build.xml
+++ b/build.xml
@@ -754,28 +754,6 @@
             <fileset dir="${basedir}/plugins/source-sections/source-sections-compiler/src" includes="META-INF/services/**"/>
         </jar>
     </target>
-
-    <target name="annotation-processing-under-jdk8">
-        <property environment="env"/>
-
-        <condition property="jdk18" value="${env.JDK_18}" else="${env.JAVA_HOME}">
-            <isset property="env.JDK_18" />
-        </condition>
-        <java classname="org.apache.tools.ant.launch.Launcher"
-              fork="true"
-              failonerror="true"
-              timeout="4000000"
-              taskname="startAnt"
-              jvm="${jdk18}/bin/java">
-            <env key="JAVA_HOME" value="${jdk18}"/>
-            <classpath>
-                <pathelement location="${ant.home}/lib/ant-launcher.jar"/>
-            </classpath>
-            <arg line="-f" />
-            <arg line="build.xml" />
-            <arg line="annotation-processing" />
-        </java>
-    </target>
     
     <target name="annotation-processing">
         <cleandir dir="${output}/classes/annotation-processing"/>
@@ -962,7 +940,7 @@
             depends="gradle-runtime,mock-runtime-for-test"/>
 
     <target name="other-artifacts"
-            depends="android-extensions-compiler,allopen-compiler-plugin,noarg-compiler-plugin,sam-with-receiver-compiler-plugin,source-sections-compiler-plugin,annotation-processing-under-jdk8,daemon-client,compiler-client-embeddable,kotlin-build-common-test" />
+            depends="android-extensions-compiler,allopen-compiler-plugin,noarg-compiler-plugin,sam-with-receiver-compiler-plugin,source-sections-compiler-plugin,annotation-processing,daemon-client,compiler-client-embeddable,kotlin-build-common-test" />
 
     <target name="dist"
             depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler-fork,compiler-sources,ant-tools,runtime,other-artifacts"