From ec0d1f5d06e7e9d7f1348ac9b4f936a9c66b8f27 Mon Sep 17 00:00:00 2001
From: Mikhail Mutcianko <mutcianko.m@gmail.com>
Date: Fri, 22 Aug 2014 18:01:14 +0400
Subject: [PATCH] fix android plugin libs dependencies

---
 idea/idea.iml             | 3 +--
 jps-plugin/jps-plugin.iml | 4 ++--
 update_dependencies.xml   | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/idea/idea.iml b/idea/idea.iml
index 33855e3dbfb..7d83992d4f4 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/src/META-INF/plugin.xml" />
+<module version="4">
   <component name="EclipseModuleManager">
     <libelement value="jar://$MODULE_DIR$/../lib/asm-util-3.3.1.jar!/" />
     <src_description expected_position="1">
diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml
index 85b9676426c..201c8d3bb04 100644
--- a/jps-plugin/jps-plugin.iml
+++ b/jps-plugin/jps-plugin.iml
@@ -20,8 +20,8 @@
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="library" name="asm" level="project" />
-    <orderEntry type="library" name="android" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="android" level="project" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="preloader" />
   </component>
-</module>
\ No newline at end of file
+</module>
diff --git a/update_dependencies.xml b/update_dependencies.xml
index bcd0f037ce7..c8d3023be77 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -524,6 +524,5 @@
                 <fail message="File name '${android.file.name}' wasn't matched"/>
             </else>
         </if>
-        <copydir src="${android.destination.dir}/plugins/android" dest="ideaSDK/plugins/android"/>
     </target>
 </project>