From ed3f3f976e28df357cf3f97fe09d212e291903b0 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Mon, 27 May 2019 22:11:31 +0300
Subject: [PATCH] Split shared: Add kotlin-native-utils into K/N distribution

---
 backend.native/build.gradle | 4 +++-
 build.gradle                | 1 +
 cmd/run_konan               | 3 ++-
 cmd/run_konan.bat           | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/backend.native/build.gradle b/backend.native/build.gradle
index d50417e9d63..e15d289e101 100644
--- a/backend.native/build.gradle
+++ b/backend.native/build.gradle
@@ -112,6 +112,7 @@ configurations {
     kotlin_stdlib_jar
     kotlin_reflect_jar
     kotlin_script_runtime_jar
+    kotlin_native_utils_jar
     trove4j_jar
     kotlinCommonSources
 
@@ -131,6 +132,7 @@ dependencies {
     kotlin_stdlib_jar "$kotlinStdLibModule@jar"
     kotlin_reflect_jar "$kotlinReflectModule@jar"
     kotlin_script_runtime_jar "$kotlinScriptRuntimeModule@jar"
+    kotlin_native_utils_jar "$kotlinNativeUtilsModule@jar"
 
     [kotlinCommonStdlibModule, kotlinTestCommonModule, kotlinTestAnnotationsCommonModule].each {
         kotlinCommonSources(it) { transitive = false }
@@ -232,7 +234,7 @@ jar {
     dependsOn ':runtime:hostRuntime', 'external_jars'
 }
 
-def externalJars = ['compiler', 'stdlib', 'reflect', 'script_runtime']
+def externalJars = ['compiler', 'stdlib', 'reflect', 'script_runtime', 'native_utils']
 
 task trove4jCopy(type: Copy) {
     from configurations.getByName("trove4j_jar") {
diff --git a/build.gradle b/build.gradle
index 3f4b4c91b96..f4db84c7e5b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,6 +57,7 @@ ext {
     kotlinTestAnnotationsCommonModule="org.jetbrains.kotlin:kotlin-test-annotations-common:${kotlinStdlibVersion}:sources"
     kotlinReflectModule="org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}"
     kotlinScriptRuntimeModule="org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}"
+    kotlinNativeUtilsModule="org.jetbrains.kotlin:kotlin-native-utils:${kotlinVersion}"
 
     konanVersionFull = KonanVersionGeneratedKt.getCurrentKonanVersion()
 
diff --git a/cmd/run_konan b/cmd/run_konan
index 5328c6f8d95..2c201a5aabe 100755
--- a/cmd/run_konan
+++ b/cmd/run_konan
@@ -90,8 +90,9 @@ EXTRACTED_METADATA_JAR="${KONAN_HOME}/konan/lib/konan.metadata.jar"
 EXTRACTED_SERIALIZER_JAR="${KONAN_HOME}/konan/lib/konan.serializer.jar"
 KLIB_JAR="${KONAN_HOME}/konan/lib/klib.jar"
 UTILITIES_JAR="${KONAN_HOME}/konan/lib/utilities.jar"
+NATIVE_UTILS_JAR="${KONAN_HOME}/konan/lib/kotlin-native-utils.jar"
 TROVE_JAR="${KONAN_HOME}/konan/lib/trove4j.jar"
-KONAN_CLASSPATH="$KOTLIN_JAR:$KOTLIN_STDLIB_JAR:$KOTLIN_REFLECT_JAR:$KOTLIN_SCRIPT_RUNTIME_JAR:$INTEROP_JAR:$STUB_GENERATOR_JAR:$INTEROP_INDEXER_JAR:$KONAN_JAR:$KLIB_JAR:$UTILITIES_JAR:$SHARED_JAR:$EXTRACTED_METADATA_JAR:$EXTRACTED_SERIALIZER_JAR:$TROVE_JAR"
+KONAN_CLASSPATH="$KOTLIN_JAR:$KOTLIN_STDLIB_JAR:$KOTLIN_REFLECT_JAR:$KOTLIN_SCRIPT_RUNTIME_JAR:$INTEROP_JAR:$STUB_GENERATOR_JAR:$INTEROP_INDEXER_JAR:$KONAN_JAR:$KLIB_JAR:$UTILITIES_JAR:$SHARED_JAR:$EXTRACTED_METADATA_JAR:$EXTRACTED_SERIALIZER_JAR:$NATIVE_UTILS_JAR:$TROVE_JAR"
 TOOL_CLASS=org.jetbrains.kotlin.cli.utilities.MainKt
 
 LIBCLANG_DISABLE_CRASH_RECOVERY=1 \
diff --git a/cmd/run_konan.bat b/cmd/run_konan.bat
index e33714ddbe9..6fce5f2cba9 100644
--- a/cmd/run_konan.bat
+++ b/cmd/run_konan.bat
@@ -67,9 +67,10 @@ set "KOTLIN_REFLECT_JAR=%KONAN_LIB%\kotlin-stdlib.jar"
 set "KOTLIN_SCRIPT_RUNTIME_JAR=%KONAN_LIB%\kotlin-script-runtime.jar"
 set "STUB_GENERATOR_JAR=%KONAN_LIB%\StubGenerator.jar"
 set "UTILITIES_JAR=%KONAN_LIB%\utilities.jar"
+set "NATIVE_UTILS_JAR=%KONAN_LIB%\kotlin-native-utils.jar"
 set TROVE_JAR="%KONAN_LIB%\lib\trove4j.jar"
 
-set "KONAN_CLASSPATH=%KOTLIN_JAR%;%KOTLIN_STDLIB_JAR%;%KOTLIN_REFLECT_JAR%;%KOTLIN_SCRIPT_RUNTIME_JAR%;%INTEROP_RUNTIME_JAR%;%KONAN_JAR%;%STUB_GENERATOR_JAR%;%INTEROP_INDEXER_JAR%;%SHARED_JAR%;%EXTRACTED_METADATA_JAR%;%EXTRACTED_SERIALIZER_JAR%;%KLIB_JAR%;%UTILITIES_JAR%;%TROVE_JAR%"
+set "KONAN_CLASSPATH=%KOTLIN_JAR%;%KOTLIN_STDLIB_JAR%;%KOTLIN_REFLECT_JAR%;%KOTLIN_SCRIPT_RUNTIME_JAR%;%INTEROP_RUNTIME_JAR%;%KONAN_JAR%;%STUB_GENERATOR_JAR%;%INTEROP_INDEXER_JAR%;%SHARED_JAR%;%EXTRACTED_METADATA_JAR%;%EXTRACTED_SERIALIZER_JAR%;%KLIB_JAR%;%UTILITIES_JAR%;%NATIVE_UTILS_JAR%;%TROVE_JAR%"
 
 set JAVA_OPTS=-ea ^
     -Xmx3G ^