From aeeea6cda7e73155999a287cda787b8d50c7fce4 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Wed, 29 Oct 2014 18:27:22 +0300
Subject: [PATCH] Plugin configuration files united

---
 plugins/android-idea-plugin/src/META-INF/android.xml | 5 -----
 plugins/android-idea-plugin/src/META-INF/plugin.xml  | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 plugins/android-idea-plugin/src/META-INF/android.xml

diff --git a/plugins/android-idea-plugin/src/META-INF/android.xml b/plugins/android-idea-plugin/src/META-INF/android.xml
deleted file mode 100644
index 46321d4ff89..00000000000
--- a/plugins/android-idea-plugin/src/META-INF/android.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<idea-plugin>
-    <extensions defaultExtensionNs="com.intellij">
-        <gotoDeclarationHandler implementation="org.jetbrains.jet.plugin.android.AndroidGotoDeclarationHandler"/>
-    </extensions>
-</idea-plugin>
diff --git a/plugins/android-idea-plugin/src/META-INF/plugin.xml b/plugins/android-idea-plugin/src/META-INF/plugin.xml
index 55499890780..6ee554db8c3 100644
--- a/plugins/android-idea-plugin/src/META-INF/plugin.xml
+++ b/plugins/android-idea-plugin/src/META-INF/plugin.xml
@@ -9,13 +9,13 @@
   <idea-version since-build="138.977" until-build="138.9999"/>
 
   <depends optional="false">org.jetbrains.kotlin</depends>
-  <depends optional="false" config-file="android.xml">org.jetbrains.android</depends>
+  <depends optional="false">org.jetbrains.android</depends>
 
   <extensions defaultExtensionNs="com.intellij">
       <projectService serviceInterface="org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor"
                       serviceImplementation="org.jetbrains.jet.plugin.android.IDEAndroidUIXmlProcessor"/>
       <compileServer.plugin classpath="jps/kotlin-android-extensions-jps.jar;android-compiler-plugin.jar"/>
-
+      <gotoDeclarationHandler implementation="org.jetbrains.jet.plugin.android.AndroidGotoDeclarationHandler"/>
       <renamePsiElementProcessor id="KotlinAndroidSyntheticProperty"
                                  implementation="org.jetbrains.jet.plugin.android.AndroidRenameProcessor"
                                  order="first"/>