Drop obsolete code in built-in serialization

compiler/builtins-serializer/src/BuiltInsSerializer.kt

@@ -175,7 +175,7 @@ public class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) {
 
         val nameStream = ByteArrayOutputStream()
         NameSerializationUtil.serializeStringTable(nameStream, serializer.getStringTable())
-        write(destDir, BuiltInsSerializationUtil.getStringTableFilePath(fqName).first(), nameStream)
+        write(destDir, BuiltInsSerializationUtil.getStringTableFilePath(fqName), nameStream)
     }
 
     fun write(destDir: File, fileName: String, stream: ByteArrayOutputStream) {

core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.kt

@@ -45,11 +45,8 @@ public object BuiltInsSerializationUtil {
     platformStatic public fun getPackageFilePath(fqName: FqName): String =
             packageFqNameToPath(fqName) + "/" + PACKAGE_FILE_NAME
 
-    platformStatic public fun getStringTableFilePath(fqName: FqName): List<String> =
+    platformStatic public fun getStringTableFilePath(fqName: FqName): String =
-            listOf(
+            packageFqNameToPath(fqName) + "/" + STRING_TABLE_FILE_NAME
-                    packageFqNameToPath(fqName) + "/" + STRING_TABLE_FILE_NAME,
-                    packageFqNameToPath(fqName) + "/.kotlin_name_table" // TODO: drop
-            )
 
     platformStatic public fun getClassNamesFilePath(fqName: FqName): String =
             packageFqNameToPath(fqName) + "/" + CLASS_NAMES_FILE_NAME

core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt

@@ -24,9 +24,7 @@ import org.jetbrains.jet.lang.descriptors.PackageFragmentProviderImpl
 import org.jetbrains.jet.lang.descriptors.impl.PackageFragmentDescriptorImpl
 import org.jetbrains.jet.lang.resolve.name.*
 import org.jetbrains.jet.storage.StorageManager
-import java.io.DataInputStream
 import java.io.InputStream
-import java.util.ArrayList
 import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents
 import com.google.protobuf.ExtensionRegistryLite
 
@@ -45,9 +43,9 @@ public class BuiltinsPackageFragment(
         extensionRegistry
     }
 
-    private val nameResolver = BuiltInsSerializationUtil.getStringTableFilePath(fqName).let { paths ->
+    private val nameResolver = NameSerializationUtil.deserializeNameResolver(
-        NameSerializationUtil.deserializeNameResolver(loadResource(paths[0]) ?: getStream(paths[1]))
+            getStream(BuiltInsSerializationUtil.getStringTableFilePath(fqName))
-    }
+    )
 
     public val provider: PackageFragmentProvider = PackageFragmentProviderImpl(listOf(this))
 
@@ -72,21 +70,7 @@ public class BuiltinsPackageFragment(
     }
 
     private fun readClassNames(proto: ProtoBuf.Package): List<Name> {
-        val stream = loadResource(BuiltInsSerializationUtil.getClassNamesFilePath(fqName))
+        return proto.getExtension(BuiltInsProtoBuf.className)?.map { id -> nameResolver.getName(id) } ?: listOf()
-
-        if (stream == null) {
-            return proto.getExtension(BuiltInsProtoBuf.className)?.map { id -> nameResolver.getName(id) } ?: listOf()
-        }
-
-        // TODO: drop
-        return DataInputStream(stream).use { data ->
-            val size = data.readInt()
-            val result = ArrayList<Name>(size)
-            size.times {
-                result.add(nameResolver.getName(data.readInt()))
-            }
-            result
-        }
     }
 
     override fun getMemberScope() = members