Revert of DevTools: Avoid build errors when dynamic module and application names clash

Source/devtools/scripts/concatenate_application_code.py

Index: Source/devtools/scripts/concatenate_application_code.py
diff --git a/Source/devtools/scripts/concatenate_application_code.py b/Source/devtools/scripts/concatenate_application_code.py
index 5a3feeb386e504df5a556feca68468ac4f557207..f750fac6efc404f5984f93c568dde3c3576b06ed 100755
--- a/Source/devtools/scripts/concatenate_application_code.py
+++ b/Source/devtools/scripts/concatenate_application_code.py
@@ -80,7 +80,7 @@
     if not scripts:
         return
     worker_dir = path.join(application_dir, module_name)
-    output_file_path = path.join(output_dir, module_name, module_name + '_module.js')
+    output_file_path = path.join(output_dir, module_name, module_name + '.js')
 
     output = StringIO()
     output.write('/* Worker %s */\n' % module_name)
@@ -96,6 +96,12 @@
             output.write('\n/* Module %s */\n' % dep_name)
             modular_build.concatenate_scripts(scripts, path.join(application_dir, dep_name), output_dir, output)
 
+    output.write('\n/* Initialize worker */\n')
+    # Tell Runtime we are in the compiled mode.
+    output.write('allDescriptors = ')
+    output.write(json.dumps(dep_descriptors))
+    output.write(';\nRuntime.initializeWorker("%s");' % module_name)
+
     write_file(output_file_path, minify_if_needed(output.getvalue(), minify))
     output.close()