From 0c094b1719158e647e129cda9abe0d2ae0f46190 Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Tue, 21 Jul 2020 15:17:12 +0300
Subject: [PATCH] Serialize jvm reflect into builtIns

Basically this is revert of 427e34fe5ade77bd2 commit
This was done due to the KT-39728.
Also we do pick every file separately, because builtIn serializer
unable to filter expects
---
 core/builtins/build.gradle.kts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/builtins/build.gradle.kts b/core/builtins/build.gradle.kts
index 1be34d52a8f..a0373902991 100644
--- a/core/builtins/build.gradle.kts
+++ b/core/builtins/build.gradle.kts
@@ -8,7 +8,8 @@ plugins {
 
 val builtinsSrc = fileFrom(rootDir, "core", "builtins", "src")
 val builtinsNative = fileFrom(rootDir, "core", "builtins", "native")
-val kotlinReflect = fileFrom(rootDir, "libraries/stdlib/src/kotlin/reflect")
+val kotlinReflectCommon = fileFrom(rootDir, "libraries/stdlib/src/kotlin/reflect/")
+val kotlinReflectJvm = fileFrom(rootDir, "libraries/stdlib/jvm/src/kotlin/reflect")
 val builtinsCherryPicked = fileFrom(buildDir, "src")
 
 val runtimeElements by configurations.creating {
@@ -20,9 +21,15 @@ val runtimeElements by configurations.creating {
 }
 
 val prepareSources by tasks.registering(Sync::class) {
-    from(kotlinReflect) {
-        exclude("typeOf.kt")
-        exclude("KClasses.kt")
+    from(kotlinReflectJvm) {
+        exclude("TypesJVM.kt")
+        exclude("KClassesImpl.kt")
+    }
+    from(kotlinReflectCommon) {
+        include("KTypeProjection.kt")
+        include("KClassifier.kt")
+        include("KTypeParameter.kt")
+        include("KVariance.kt")
     }
     into(builtinsCherryPicked)
 }