From 02578bc378204ab3123a0f81a9accde32a73d3fe Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Wed, 18 Apr 2018 18:31:39 +0300
Subject: [PATCH] Add dependency on `com.intellij.modules.androidstudio` to AS
 3.1 & 3.2 plugin.xml

---
 idea/src/META-INF/plugin.xml.as31 | 3 +--
 idea/src/META-INF/plugin.xml.as32 | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/idea/src/META-INF/plugin.xml.as31 b/idea/src/META-INF/plugin.xml.as31
index 9aaff685110..a146e428638 100644
--- a/idea/src/META-INF/plugin.xml.as31
+++ b/idea/src/META-INF/plugin.xml.as31
@@ -9,6 +9,7 @@
   <idea-version since-build="173.1" until-build="173.4301.25"/>
 
   <depends>com.intellij.modules.platform</depends>
+  <depends>com.intellij.modules.androidstudio</depends>
 
   <!-- required for Kotlin/Native plugin -->
   <depends optional="true">org.jetbrains.kotlin.native.platform.deps</depends>
@@ -24,8 +25,6 @@
   <depends optional="true" config-file="injection.xml">org.intellij.intelliLang</depends>
   <depends optional="true" config-file="decompiler.xml">org.jetbrains.java.decompiler</depends>
 
-  <!-- DEPENDS-ON-AS-PLACEHOLDER -->
-
   <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
 
   <!-- CIDR-PLUGIN-PLACEHOLDER-START -->
diff --git a/idea/src/META-INF/plugin.xml.as32 b/idea/src/META-INF/plugin.xml.as32
index d7bc3839091..3aec5fbf523 100644
--- a/idea/src/META-INF/plugin.xml.as32
+++ b/idea/src/META-INF/plugin.xml.as32
@@ -9,6 +9,7 @@
   <idea-version since-build="181.1" until-build="181.*"/>
 
   <depends>com.intellij.modules.platform</depends>
+  <depends>com.intellij.modules.androidstudio</depends>
 
   <!-- required for Kotlin/Native plugin -->
   <depends optional="true">org.jetbrains.kotlin.native.platform.deps</depends>
@@ -24,8 +25,6 @@
   <depends optional="true" config-file="injection.xml">org.intellij.intelliLang</depends>
   <depends optional="true" config-file="decompiler.xml">org.jetbrains.java.decompiler</depends>
 
-  <!-- DEPENDS-ON-AS-PLACEHOLDER -->
-
   <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
 
   <!-- CIDR-PLUGIN-PLACEHOLDER-START -->