From 7423e30065fc1e1c7b9001576f015a0a2c6c17b9 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Wed, 18 Feb 2015 17:39:55 +0300
Subject: [PATCH] Removed Android dependencies from core modules

---
 compiler/cli/cli.iml                                           | 3 +--
 compiler/tests/compiler-tests.iml                              | 3 +--
 idea/idea.iml                                                  | 2 --
 jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 1 -
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
index b2429816d0e..071bbf8f03a 100644
--- a/compiler/cli/cli.iml
+++ b/compiler/cli/cli.iml
@@ -19,6 +19,5 @@
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="android-compiler-plugin" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index eeae4cf89ab..159ff881ddd 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -21,7 +21,6 @@
     <orderEntry type="module" module-name="js.tests" />
     <orderEntry type="module" module-name="preloader" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="frontend.android" scope="TEST" />
     <orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/idea/idea.iml b/idea/idea.iml
index 78bb4b737cc..a3c6acca7e9 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -38,13 +38,11 @@
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
     <orderEntry type="module" module-name="eval4j" />
-    <orderEntry type="library" name="android" level="project" />
     <orderEntry type="module" module-name="idea-analysis" exported="" />
     <orderEntry type="module" module-name="kotlin-android-plugin" />
     <orderEntry type="module" module-name="js.frontend" />
     <orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="android_tests" level="project" />
     <orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
     <orderEntry type="module" module-name="android-idea-plugin" scope="TEST" />
   </component>
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
index cb10338f474..6266658a7fa 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
@@ -66,7 +66,6 @@ import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind
 import org.jetbrains.jps.builders.java.dependencyView.Mappings
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import org.jetbrains.jps.model.module.JpsModule
-import org.jetbrains.jps.android.AndroidJpsUtil
 import org.jetbrains.kotlin.utils.sure
 import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider