Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2150)

Unified Diff: Source/devtools/scripts/concatenate_application_code.py

Issue 607893002: DevTools: Avoid build errors when dynamic module and application names clash (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix BUILD.gn Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/devtools/front_end/Runtime.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f750fac6efc404f5984f93c568dde3c3576b06ed..5a3feeb386e504df5a556feca68468ac4f557207 100755
--- a/Source/devtools/scripts/concatenate_application_code.py
+++ b/Source/devtools/scripts/concatenate_application_code.py
@@ -80,7 +80,7 @@ def concatenate_worker(module_name, descriptors, application_dir, output_dir, mi
if not scripts:
return
worker_dir = path.join(application_dir, module_name)
- output_file_path = path.join(output_dir, module_name, module_name + '.js')
+ output_file_path = path.join(output_dir, module_name, module_name + '_module.js')
output = StringIO()
output.write('/* Worker %s */\n' % module_name)
@@ -96,12 +96,6 @@ def concatenate_worker(module_name, descriptors, application_dir, output_dir, mi
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()
« no previous file with comments | « Source/devtools/front_end/Runtime.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698