diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant
index a79fb54395d0..3a7d54ca6c43 100644
--- a/build/scripts/dist.gant
+++ b/build/scripts/dist.gant
@@ -45,6 +45,8 @@ class Paths {
 def paths = new Paths(out)
 setProperty("paths", paths)
 
+setProperty("maySkipAndroidPlugin", true)
+
 target(compile: "Compile project") {
   loadProject()
 
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 6eb85a76a4ae..d9f32faec925 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -254,7 +254,12 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
 }
 
 public def layoutCommunityPlugins(String home) {
-  layoutAndroid("$home/android")
+  if (!isDefined("maySkipAndroidPlugin") || new File("$home/android").exists()) {
+    layoutAndroid("$home/android")
+  }
+  else {
+    projectBuilder.warning("Android plugin sources aren't found at $home/android. Android plugin is excluded from layout.")
+  }
 
   dir("plugins") {
     def simplePlugins = ["commander", "copyright", "java-i18n", "hg4idea", "github"] //, "tasks-time-tracking"]