Merge remote-tracking branch 'aosp/snapshot-master' into merge

1 files changed, 6 insertions, 0 deletions

diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index f699f45c7a7e..d804b95bc8dd 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -336,6 +336,11 @@ public def layoutCommunityPlugins(String home) {
       jar("git4idea-rt.jar") {
         module("git4idea-rt")
       }
+      if (!isDefined("pluginFilter")) {//temporary fix to exclude remote-servers-git module from layout for small IDEs because corresponding module isn't compiled
+        jar("remote-servers-git.jar") {
+          module("remote-servers-git")
+        }
+      }
       fileset(dir: "$home/plugins/git4idea/lib") {
         include(name: "trilead-ssh2.jar")
       }
@@ -777,6 +782,7 @@ def layoutCommunityJps(String home, String target) {
       include(name: "log4j.jar")
       include(name: "jgoodies-forms.jar")
       include(name: "ecj*.jar")
+      include(name: "jsr166e.jar")
     }
     dir("test") {
       jar("jps-build-test.jar") {