DevTools: Fix content_shell devtools built in debug_devtools=1 mode

Source/devtools/devtools.gyp

 #
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #         * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #         * Redistributions in binary form must reproduce the above
@@ skipping 100 matching lines @@
             'dependencies': [
                 'devtools_html',
                 'devtools_extension_api',
                 'devtools_frontend_resources',
             ],
             'conditions': [
                 ['debug_devtools==0', {
                     'actions': [{
                         'action_name': 'generate_devtools_grd',
                         'script_name': 'scripts/generate_devtools_grd.py',
-                        'relative_path_dir': '<(PRODUCT_DIR)/resources/inspector',
+                        'relative_path_dirs': [
+                            '<(PRODUCT_DIR)/resources/inspector',
+                            'front_end'
+                        ],
                         'input_pages': [
                             '<(PRODUCT_DIR)/resources/inspector/devtools.html',
                             '<(PRODUCT_DIR)/resources/inspector/Main.js',
                             '<(PRODUCT_DIR)/resources/inspector/search/AdvancedSearchView.js',
                             '<(PRODUCT_DIR)/resources/inspector/console/ConsolePanel.js',
                             '<(PRODUCT_DIR)/resources/inspector/elements/ElementsPanel.js',
                             '<(PRODUCT_DIR)/resources/inspector/extensions/ExtensionServer.js',
                             '<(PRODUCT_DIR)/resources/inspector/resources/ResourcesPanel.js',
                             '<(PRODUCT_DIR)/resources/inspector/network/NetworkPanel.js',
                             '<(PRODUCT_DIR)/resources/inspector/source_frame/SourceFrame.js',
                             '<(PRODUCT_DIR)/resources/inspector/sources/SourcesPanel.js',
                             '<(PRODUCT_DIR)/resources/inspector/timeline/TimelinePanel.js',
                             '<(PRODUCT_DIR)/resources/inspector/profiler/ProfilesPanel.js',
                             '<(PRODUCT_DIR)/resources/inspector/audits/AuditsPanel.js',
                             '<(PRODUCT_DIR)/resources/inspector/layers/LayersPanel.js',
                             '<(PRODUCT_DIR)/resources/inspector/profiler/heap_snapshot_worker/HeapSnapshotWorker.js',
                             '<(PRODUCT_DIR)/resources/inspector/script_formatter_worker/ScriptFormatterWorker.js',
                             '<(PRODUCT_DIR)/resources/inspector/temp_storage_shared_worker/TempStorageSharedWorker.js',
                             '<(PRODUCT_DIR)/resources/inspector/devices/DevicesView.js',
                             '<(PRODUCT_DIR)/resources/inspector/inspector.css',
                             '<(PRODUCT_DIR)/resources/inspector/devtools_extension_api.js',
                             '<@(devtools_standalone_files)',
+                            '<@(devtools_cm_css_files)',
                         ],
                         'images': [
                             '<@(devtools_image_files)',
                         ],
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_pages)',
                             '<@(_images)',
                         ],
                         'images_path': [
                             'front_end/Images',
                         ],
                         'outputs': ['<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd'],
-                        'action': ['python', '<@(_script_name)', '<@(_input_pages)', '--relative_path_dir', '<@(_relative_path_dir)', '--images', '<@(_images_path)', '--output', '<@(_outputs)'],
+                        'action': ['python', '<@(_script_name)', '<@(_input_pages)', '--relative_path_dirs', '<@(_relative_path_dirs)', '--images', '<@(_images_path)', '--output', '<@(_outputs)'],
                     }],
                 },
                 {
                     # If we're not concatenating devtools files, we want to
                     # run after the original files have been copied to
                     # <(PRODUCT_DIR)/resources/inspector.
                     'dependencies': ['devtools_frontend_resources'],
                     'actions': [{
                         'action_name': 'generate_devtools_grd',
                         'script_name': 'scripts/generate_devtools_grd.py',
-                        'relative_path_dir': 'front_end',
+                        'relative_path_dirs': [
+                            '<(PRODUCT_DIR)/resources/inspector',

[vsevik, 2014/05/15 13:57:47]

Consider adding <(SHARED_INTERMEDIATE_DIR)/blink/ as well

[apavlov, 2014/05/15 14:25:28]

Done.

+                            'front_end'
+                        ],
                         'input_pages': [
                             '<@(all_devtools_files)',
                             '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorBackendCommands.js',
                             '<(SHARED_INTERMEDIATE_DIR)/blink/SupportedCSSProperties.js',
                             '<(PRODUCT_DIR)/resources/inspector/devtools.html',
                         ],
                         'images': [
                             '<@(devtools_image_files)',
                         ],
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_pages)',
                             '<@(_images)',
                         ],
                         'images_path': [
                             'front_end/Images',
                         ],
                         # Note that other files are put under /devtools directory, together with declared devtools_resources.grd
                         'outputs': ['<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd'],
-                        'action': ['python', '<@(_script_name)', '<@(_input_pages)', '--relative_path_dir', '<@(_relative_path_dir)', '--images', '<@(_images_path)', '--output', '<@(_outputs)'],
+                        'action': ['python', '<@(_script_name)', '<@(_input_pages)', '--relative_path_dirs', '<@(_relative_path_dirs)', '--images', '<@(_images_path)', '--output', '<@(_outputs)'],
                     }],
                 }],
             ],
         },
         {
           'target_name': 'frontend_protocol_sources',
           'type': 'none',
           'actions': [
             {
               'action_name': 'generateInspectorProtocolFrontendSources',
@@ skipping 334 matching lines @@
             'type': 'none',
             'conditions': [
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_source_frame_module',
                         'script_name': 'scripts/inline_js_imports.py',
                         'input_file': 'front_end/source_frame/SourceFrame.js',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(devtools_source_frame_js_files)',
-                            '<@(devtools_cm_files)',
+                            '<@(devtools_cm_js_files)',
                         ],
                         'outputs': ['<(PRODUCT_DIR)/resources/inspector/source_frame/SourceFrame.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/source_frame',
                             'files': [
                                 '<@(devtools_source_frame_js_files)',
                                 'front_end/source_frame/module.json',
                             ],
                         },
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/cm',
                             'files': [
-                                '<@(devtools_cm_files)',
+                                '<@(devtools_cm_js_files)',
+                                '<@(devtools_cm_css_files)',
                             ],
                         }
                     ]
                 }]
             ]
         },
         {
             'target_name': 'build_sources_module',
             'type': 'none',
             'conditions': [
@@ skipping 286 matching lines @@
                         ],
                     }],
                 },
                 {
                     'target_name': 'concatenated_module_descriptors',
                     'type': 'none',
                     'actions': [{
                         'action_name': 'concatenated_module_descriptors',
                         'script_name': 'scripts/concatenate_module_descriptors.py',
                         'input_file': ['front_end/common/modules.js'],
-                        'module_json_files': [
-                            'front_end/audits/module.json',
-                            'front_end/components/module.json',
-                            'front_end/console/module.json',
-                            'front_end/devices/module.json',
-                            'front_end/elements/module.json',
-                            'front_end/extensions/module.json',
-                            'front_end/layers/module.json',
-                            'front_end/main/module.json',
-                            'front_end/network/module.json',
-                            'front_end/profiler/module.json',
-                            'front_end/resources/module.json',
-                            'front_end/search/module.json',
-                            'front_end/settings/module.json',
-                            'front_end/source_frame/module.json',
-                            'front_end/sources/module.json',
-                            'front_end/timeline/module.json',
-                        ],
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
-                            '<@(_module_json_files)',
+                            '<@(devtools_module_json_files)',
                         ],
                         'outputs': ['<(SHARED_INTERMEDIATE_DIR)/blink/common/modules.js'],
-                        'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)', '<@(_module_json_files)'],
+                        'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)', '<@(devtools_module_json_files)'],
                     }],
                 },
             ],
         }],
     ], # conditions
 }