From f00d4022c49d67e3d97853d17743fd2ecece0a8f Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 6 Oct 2023 21:54:07 +0200 Subject: [PATCH] [stdlib] Use common js sources in js-ir compilation without copying --- libraries/stdlib/build.gradle.kts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libraries/stdlib/build.gradle.kts b/libraries/stdlib/build.gradle.kts index a3e55ea073a..cabb39dee65 100644 --- a/libraries/stdlib/build.gradle.kts +++ b/libraries/stdlib/build.gradle.kts @@ -329,6 +329,13 @@ kotlin { val prepareJsIrMainSources by tasks.registering(Sync::class) kotlin { srcDir(prepareJsIrMainSources) + srcDir("$jsCommonDir/src").apply { + exclude("kotlin/browser") + exclude("kotlin/dom") + exclude("kotlinx") + exclude("org.w3c") + } + srcDir("$jsCommonDir/runtime") srcDir("$jsIrDir/builtins") srcDir("$jsIrDir/runtime") srcDir("$jsIrDir/src") @@ -342,17 +349,9 @@ kotlin { // TODO: try to reuse absolute paths defined in the beginning val sources = listOf( "core/builtins/src/kotlin/", - "libraries/stdlib/js/src/", - "libraries/stdlib/js/runtime/" ) + unimplementedNativeBuiltIns val excluded = listOf( - // stdlib/js/src/generated is used exclusively for current `js-v1` backend. - "libraries/stdlib/js/src/kotlin/browser", - "libraries/stdlib/js/src/kotlin/dom", - "libraries/stdlib/js/src/org.w3c", - "libraries/stdlib/js/src/kotlinx", - // JS-specific optimized version of emptyArray() already defined "core/builtins/src/kotlin/ArrayIntrinsics.kt", // included in common