1 files changed, 2 insertions, 11 deletions
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index e33f920fe146..6eb85a76a4ae 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -254,9 +254,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
 }
 
 public def layoutCommunityPlugins(String home) {
-  if (isDefined("androidPluginHome")) {
-    layoutAndroid(p("androidPluginHome"))
-  }
+  layoutAndroid("$home/android")
 
   dir("plugins") {
     def simplePlugins = ["commander", "copyright", "java-i18n", "hg4idea", "github"] //, "tasks-time-tracking"]
@@ -554,14 +552,7 @@ public def layoutCommunityPlugins(String home) {
       }
     }
 
-    pluginDir("java-decompiler") {
-      dir("lib") {
-        jar("java-decompiler.jar") {
-          module("java-decompiler")
-        }
-        fileset(file: "$home/plugins/java-decompiler/lib/fernflower.jar")
-      }
-    }
+    layoutPlugin("java-decompiler")
   }
 }