From 3dc92c209f23fe694dee3d1162e0a56ec858e2cd Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 15 May 2014 21:53:44 +0400
Subject: [PATCH] Don't compile Java sources of built-ins

Module 'builtins' no longer has (and is not supposed to have) Java sources
---
 build.xml                                                      | 2 +-
 .../jet/codegen/forTestCompile/ForTestCompileRuntime.java      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 6db078f304d..3c08e4ef5f8 100644
--- a/build.xml
+++ b/build.xml
@@ -567,7 +567,7 @@
 
         <new_kotlinc src="${basedir}/core/builtins/src${path.separator}${basedir}/core/runtime.jvm/src${path.separator}${basedir}/core/reflection/src"
                      output="${output}/classes/runtime"
-                     classpath="${basedir}/core/builtins/src${path.separator}${basedir}/core/runtime.jvm/src"/>
+                     classpath="${basedir}/core/runtime.jvm/src"/>
 
         <javac2 destdir="${output}/classes/runtime" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" source="${java.target}" target="${java.target}">
             <src path="${basedir}/core/runtime.jvm/src"/>
diff --git a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
index c16ed690a48..95648907a82 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
@@ -17,7 +17,6 @@
 package org.jetbrains.jet.codegen.forTestCompile;
 
 import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.cli.common.ExitCode;
@@ -62,7 +61,7 @@ public class ForTestCompileRuntime {
         compileKotlinToJvm("built-ins", destDir, src, src);
 
         JetTestUtils.compileJavaFiles(
-                ContainerUtil.concat(javaFilesUnder(BUILT_INS_SRC_PATH), javaFilesUnder(RUNTIME_JVM_SRC_PATH)),
+                javaFilesUnder(RUNTIME_JVM_SRC_PATH),
                 Arrays.asList(
                         "-classpath", destDir.getPath(),
                         "-d", destDir.getPath()