Clean most of the shared source roots conflicts

2017-09-11 15:15:02 +02:00
parent e26b421e6c
commit a61facf3d1
8 changed files with 84 additions and 24 deletions
@@ -104,6 +104,7 @@ extra["ideaCoreSdkJars"] = arrayOf("annotations", "asm-all", "guava", "intellij-

 extra["compilerModules"] = arrayOf(":compiler:util",
                                   ":compiler:container",
+                                   ":compiler:conditional-preprocessor",
                                   ":compiler:resolution",
                                   ":compiler:serialization",
                                   ":compiler:frontend",
@@ -111,6 +112,7 @@ extra["compilerModules"] = arrayOf(":compiler:util",
                                   ":compiler:frontend.script",
                                   ":compiler:cli-common",
                                   ":compiler:daemon-common",
+                                   ":compiler:daemon",
                                   ":compiler:ir.tree",
                                   ":compiler:ir.psi2ir",
                                   ":compiler:backend-common",