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

Unified Diff: Source/devtools/devtools.gypi

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/devtools.gyp ('k') | Source/devtools/front_end/Runtime.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/devtools.gypi
diff --git a/Source/devtools/devtools.gypi b/Source/devtools/devtools.gypi
index 25bb99e144898e797f24a2dcee96bb4ee5631d5b..4699a6722304bae4c7fe7e5eafd39040942c1b36 100644
--- a/Source/devtools/devtools.gypi
+++ b/Source/devtools/devtools.gypi
@@ -40,6 +40,7 @@
'<@(devtools_components_js_files)',
'<@(devtools_core_base_files)',
'<@(devtools_host_js_files)',
+ '<@(devtools_main_js_files)',
'<@(devtools_screencast_js_files)',
'<@(devtools_sdk_js_files)',
'<@(devtools_toolbox_bootstrap_js_files)',
@@ -64,7 +65,6 @@
'front_end/splitView.css',
'front_end/suggestBox.css',
'front_end/tabbedPane.css',
- '<@(devtools_main_js_files)',
'<@(devtools_standalone_files)',
],
'devtools_common_js_files': [
@@ -453,7 +453,6 @@
'front_end/cm/xml.js',
'front_end/common/WebInspector.js',
'front_end/common/utilities.js',
- 'front_end/common/utilities.js',
'front_end/script_formatter_worker/CSSFormatter.js',
'front_end/script_formatter_worker/JavaScriptFormatter.js',
'front_end/script_formatter_worker/ScriptFormatterWorker.js',
@@ -575,6 +574,7 @@
'<@(devtools_promises_js_files)',
'<@(devtools_resources_js_files)',
'<@(devtools_script_formatter_worker_js_files)',
+ '<@(devtools_settings_js_files)',
'<@(devtools_source_frame_js_files)',
'<@(devtools_sources_js_files)',
'<@(devtools_temp_storage_shared_worker_js_files)',
« no previous file with comments | « Source/devtools/devtools.gyp ('k') | Source/devtools/front_end/Runtime.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698