diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant
index 9811a40cf008..08f9065a0be1 100644
--- a/python/build/pycharm_build.gant
+++ b/python/build/pycharm_build.gant
@@ -1,6 +1,7 @@
 import org.jetbrains.jps.Jps
 import org.jetbrains.jps.Module
 import static org.jetbrains.jps.idea.IdeaProjectLoader.guessHome
+import org.jetbrains.jps.LayoutInfo
 
 includeTargets << new File("${guessHome(this as Script)}/community/build/scripts/utils.gant")
 includeTargets << new File("${guessHome(this)}/build/scripts/libLicenses.gant")
@@ -225,8 +226,8 @@ target('default': "Build artifacts") {
 
   build_searchable_options()
   wire_build_date(buildName)
-  layoutFull(paths.distAll, usedJars)
-  checkLibLicensesAndGenerateTable("$paths.artifacts/third-party-libraries.txt");
+  LayoutInfo layoutInfo = layoutFull(paths.distAll, usedJars)
+  checkLibLicensesAndGenerateTable("$paths.artifacts/third-party-libraries.txt", layoutInfo.usedModules);
   buildDebuggerEgg(paths, buildName)
   scramble()
 
@@ -403,7 +404,7 @@ def layoutFull(String target, Set usedJars) {
   def openapiModules = platformApiModules()
   def implementationModules = [platformImplementationModules(), "python", "python-ide"].flatten()
 
-  layout(target) {
+  def result = layout(target) {
     dir("lib") {
       jar("util.jar") { module("util") }
 
@@ -506,6 +507,7 @@ def layoutFull(String target, Set usedJars) {
   }
 
   patchPropertiesFile(target)
+  return result
 }
 
 def layoutMac(Map args, String target) {