diff --git a/build/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/build/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
index 5b9167d99a9f..031d54ff167a 100644
--- a/build/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
@@ -245,12 +245,16 @@ class CommunityRepositoryModules {
     plugin("android") {
       withModule("android-common", "android-common.jar", false)
       withModule("android-rt", "android-rt.jar", false)
+      withModule("android-annotations", "androidAnnotations.jar")
       withModule("common")
-      withModule("sdklib")
-      withModule("sdk-common")
-      withModule("layoutlib-api")
+      withModule("sdklib", "sdklib.jar")
+      withModule("sdk-common", "sdk-common.jar")
+      withModule("layoutlib-api", "layoutlib-api.jar")
       withModule("manifest-merger")
       withModule("repository")
+      withModule("sherpa-ui", "constraint-layout.jar")
+      withModule("pixelprobe", "pixalprobe.jar")
+      withModule("manifest-merger", "manifest-merger.jar")
       withModule("assetstudio", "sdk-tools.jar")
       withModule("ddmlib", "sdk-tools.jar")
       withModule("dvlib", "sdk-tools.jar")
@@ -284,6 +288,18 @@ class CommunityRepositoryModules {
       withResource("lib/commons-compress-1.8.1.jar", "lib")
       withResource("lib/javawriter-2.2.1.jar", "lib")
       withResource("lib/juniversalchardet-1.0.3.jar", "lib")
+      withResource("lib/gluegen-rt.jar", "lib")
+      withResource("lib/gluegen-rt-natives-linux-amd64.jar", "lib")
+      withResource("lib/gluegen-rt-natives-linux-i586.jar", "lib")
+      withResource("lib/gluegen-rt-natives-macosx-universal.jar", "lib")
+      withResource("lib/gluegen-rt-natives-windows-amd64.jar", "lib")
+      withResource("lib/gluegen-rt-natives-windows-i586.jar", "lib")
+      withProjectLibrary("jogl-all") //todo[nik] move to module libraries
+      withResource("lib/jogl-all-natives-linux-amd64.jar", "lib")
+      withResource("lib/jogl-all-natives-linux-i586.jar", "lib")
+      withResource("lib/jogl-all-natives-macosx-universal.jar", "lib")
+      withResource("lib/jogl-all-natives-windows-amd64.jar", "lib")
+      withResource("lib/jogl-all-natives-windows-i586.jar", "lib")
       withResource("lib/androidWidgets", "lib/androidWidgets")
       additionalModulesToJars.entrySet().each {
         withModule(it.key, it.value)