Remove bootstrap workarounds

build.xml

@@ -66,7 +66,7 @@
         <fileset dir="${basedir}/ideaSDK/jps" includes="jps-model.jar"/>
     </path>
 
-    <typedef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${bootstrap.compiler.home}/lib/kotlin-ant.jar"/>
+    <typedef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${bootstrap.compiler.home}/lib/kotlin-ant.jar"/>
     <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${dependencies.dir}/ant-contrib.jar"/>
 
     <taskdef name="javac2" classname="org.apache.tools.ant.taskdefs.Javac"/>
@@ -390,7 +390,7 @@
 
     <target name="serialize-builtins">
         <cleandir dir="${output}/builtins"/>
-        <java classname="org.jetbrains.jet.utils.builtinsSerializer.BuiltinsSerializerPackage"
+        <java classname="org.jetbrains.kotlin.serialization.builtins.BuiltinsPackage"
               classpath="${bootstrap.compiler.home}/lib/kotlin-compiler.jar"
               failonerror="true"
               fork="true">

compiler/builtins-serializer/src/run-bootstrap.kt

@@ -1,22 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.utils.builtinsSerializer
-
-// TODO: delete this file, needed for bootstrap only
-fun main(args: Array<String>) {
-    org.jetbrains.kotlin.serialization.builtins.main(args)
-}