From 353076f596b8e95dd843206ad3dd0482bb831bc0 Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <dmitry.petrov@jetbrains.com>
Date: Mon, 21 May 2018 14:49:28 +0300
Subject: [PATCH] compiler/ir/backend.common is NOT a part of
 compiler/backend-common

---
 compiler/backend-common/build.gradle.kts    |  1 -
 compiler/ir/backend.common/build.gradle.kts | 20 ++++++++++++++++++++
 settings.gradle                             |  2 ++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 compiler/ir/backend.common/build.gradle.kts

diff --git a/compiler/backend-common/build.gradle.kts b/compiler/backend-common/build.gradle.kts
index f59e8662a79..87be07331d2 100644
--- a/compiler/backend-common/build.gradle.kts
+++ b/compiler/backend-common/build.gradle.kts
@@ -18,7 +18,6 @@ dependencies {
 sourceSets {
     "main" {
         projectDefault()
-        java.srcDir("../ir/backend.common/src")
     }
     "test" {}
 }
diff --git a/compiler/ir/backend.common/build.gradle.kts b/compiler/ir/backend.common/build.gradle.kts
new file mode 100644
index 00000000000..8f244039c41
--- /dev/null
+++ b/compiler/ir/backend.common/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+jvmTarget = "1.6"
+
+dependencies {
+    compile(project(":compiler:util"))
+    compile(project(":compiler:frontend"))
+    compile(project(":compiler:backend-common"))
+    compile(project(":compiler:ir.tree"))
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
+
diff --git a/settings.gradle b/settings.gradle
index 4fdf9b269bd..4bb3199f498 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -31,6 +31,7 @@ include ":kotlin-build-common",
         ":compiler:ir.tree",
         ":compiler:ir.psi2ir",
         ":compiler:ir.ir2cfg",
+        ":compiler:ir.backend.common",
         ":compiler:backend.js",
         ":compiler:backend-common",
         ":compiler:backend",
@@ -227,6 +228,7 @@ project(':kotlin-ant').projectDir = "$rootDir/ant" as File
 project(':compiler:ir.tree').projectDir = "$rootDir/compiler/ir/ir.tree" as File
 project(':compiler:ir.psi2ir').projectDir = "$rootDir/compiler/ir/ir.psi2ir" as File
 project(':compiler:ir.ir2cfg').projectDir = "$rootDir/compiler/ir/ir.ir2cfg" as File
+project(':compiler:ir.backend.common').projectDir = "$rootDir/compiler/ir/backend.common" as File
 project(':compiler:backend.js').projectDir = "$rootDir/compiler/ir/backend.js" as File
 project(':kotlin-jps-plugin').projectDir = "$rootDir/prepare/jps-plugin" as File
 project(':idea:idea-android-output-parser').projectDir = "$rootDir/idea/idea-android/idea-android-output-parser" as File