| Index: Source/devtools/devtools.gyp
|
| diff --git a/Source/devtools/devtools.gyp b/Source/devtools/devtools.gyp
|
| index 3833ec09359d3e99158558c63145354d62811bf9..ee855fe348fa15f0ab13502204aef29b9367d584 100644
|
| --- a/Source/devtools/devtools.gyp
|
| +++ b/Source/devtools/devtools.gyp
|
| @@ -29,6 +29,9 @@
|
| #
|
|
|
| {
|
| + 'variables': {
|
| + 'blink_devtools_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/devtools',
|
| + },
|
| 'includes': [
|
| 'devtools.gypi',
|
| ],
|
| @@ -173,12 +176,12 @@
|
| 'relative_path_dirs': [
|
| 'front_end',
|
| '<(PRODUCT_DIR)/resources/inspector',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(blink_devtools_output_dir)',
|
| ],
|
| 'input_pages': [
|
| '<@(all_devtools_files)',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorBackendCommands.js',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/SupportedCSSProperties.js',
|
| + '<(blink_devtools_output_dir)/InspectorBackendCommands.js',
|
| + '<(blink_devtools_output_dir)/SupportedCSSProperties.js',
|
| '<(PRODUCT_DIR)/resources/inspector/devtools.html',
|
| ],
|
| 'images': [
|
| @@ -212,13 +215,13 @@
|
| 'protocol.json',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorBackendCommands.js',
|
| + '<(blink_devtools_output_dir)/InspectorBackendCommands.js',
|
| ],
|
| 'action': [
|
| 'python',
|
| 'scripts/CodeGeneratorFrontend.py',
|
| 'protocol.json',
|
| - '--output_js_dir', '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '--output_js_dir', '<(blink_devtools_output_dir)',
|
| ],
|
| 'message': 'Generating Inspector protocol frontend sources from protocol.json',
|
| },
|
| @@ -239,7 +242,7 @@
|
| '../core/css/CSSShorthands.in',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/SupportedCSSProperties.js',
|
| + '<(blink_devtools_output_dir)/SupportedCSSProperties.js',
|
| ],
|
| 'action': [
|
| 'python',
|
| @@ -270,12 +273,12 @@
|
| '<@(_script_name)',
|
| '<@(_input_page)',
|
| '<@(devtools_core_js_files)',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorBackendCommands.js',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/SupportedCSSProperties.js',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/common/modules.js',
|
| + '<(blink_devtools_output_dir)/InspectorBackendCommands.js',
|
| + '<(blink_devtools_output_dir)/SupportedCSSProperties.js',
|
| + '<(blink_devtools_output_dir)/common/modules.js',
|
| ],
|
| 'search_path': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + '<(blink_devtools_output_dir)',
|
| 'front_end',
|
| ],
|
| 'outputs': ['<(PRODUCT_DIR)/resources/inspector/main/Main.js'],
|
| @@ -288,8 +291,8 @@
|
| 'destination': '<(PRODUCT_DIR)/resources/inspector',
|
| 'files': [
|
| '<@(devtools_core_base_js_files)',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorBackendCommands.js',
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink/SupportedCSSProperties.js',
|
| + '<(blink_devtools_output_dir)/InspectorBackendCommands.js',
|
| + '<(blink_devtools_output_dir)/SupportedCSSProperties.js',
|
| ],
|
| },
|
| {
|
| @@ -900,7 +903,7 @@
|
| '<@(_input_file)',
|
| '<@(devtools_module_json_files)',
|
| ],
|
| - 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/blink/common/modules.js'],
|
| + 'outputs': ['<(blink_devtools_output_dir)/common/modules.js'],
|
| 'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)', '<@(devtools_module_json_files)'],
|
| }],
|
| },
|
|
|