| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 { | 4 { | 
| 5   'variables': { | 5   'variables': { | 
| 6     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 6     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 
| 7     'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html', | 7     'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html', | 
| 8     'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i
     nternal/additional_modules_list.txt', | 8     'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i
     nternal/additional_modules_list.txt', | 
| 9     'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/om
     nibox/omnibox.mojom.js', | 9     'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/om
     nibox/omnibox.mojom.js', | 
| 10   }, | 10   }, | 
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 123             }, { # else use_chromevox_next == 0 | 123             }, { # else use_chromevox_next == 0 | 
| 124               'dependencies': [ | 124               'dependencies': [ | 
| 125                 'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox', | 125                 'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox', | 
| 126               ], | 126               ], | 
| 127             }], | 127             }], | 
| 128           ], | 128           ], | 
| 129         }], | 129         }], | 
| 130       ], | 130       ], | 
| 131     }, | 131     }, | 
| 132     { | 132     { | 
|  | 133       # GN version: //chrome/browser:chrome_internal_resources_gen | 
| 133       'target_name': 'chrome_internal_resources_gen', | 134       'target_name': 'chrome_internal_resources_gen', | 
| 134       'type': 'none', | 135       'type': 'none', | 
| 135       'conditions': [ | 136       'conditions': [ | 
| 136         ['branding=="Chrome"', { | 137         ['branding=="Chrome"', { | 
| 137           'actions': [ | 138           'actions': [ | 
| 138             { | 139             { | 
| 139               'action_name': 'generate_transform_additional_modules_list', | 140               'action_name': 'generate_transform_additional_modules_list', | 
| 140               'variables': { | 141               'variables': { | 
| 141                 'additional_modules_input_path': | 142                 'additional_modules_input_path': | 
| 142                   'browser/internal/resources/additional_modules_list.input', | 143                   'browser/internal/resources/additional_modules_list.input', | 
| (...skipping 16 matching lines...) Expand all  Loading... | 
| 159             } | 160             } | 
| 160           ], | 161           ], | 
| 161         }], | 162         }], | 
| 162       ], | 163       ], | 
| 163     }, | 164     }, | 
| 164     { | 165     { | 
| 165       # TODO(mark): It would be better if each static library that needed | 166       # TODO(mark): It would be better if each static library that needed | 
| 166       # to run grit would list its own .grd files, but unfortunately some | 167       # to run grit would list its own .grd files, but unfortunately some | 
| 167       # of the static libraries currently have circular dependencies among | 168       # of the static libraries currently have circular dependencies among | 
| 168       # generated headers. | 169       # generated headers. | 
|  | 170 | 
|  | 171       # GN version: //chrome:resources | 
| 169       'target_name': 'chrome_resources', | 172       'target_name': 'chrome_resources', | 
| 170       'type': 'none', | 173       'type': 'none', | 
| 171       'dependencies': [ | 174       'dependencies': [ | 
| 172         'about_credits', | 175         'about_credits', | 
| 173         'chrome_internal_resources_gen', | 176         'chrome_internal_resources_gen', | 
| 174         'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings', | 177         'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings', | 
| 175       ], | 178       ], | 
| 176       'actions': [ | 179       'actions': [ | 
| 177         { | 180         { | 
|  | 181           # GN version: //chrome/browser:resources | 
| 178           'action_name': 'generate_browser_resources', | 182           'action_name': 'generate_browser_resources', | 
| 179           'variables': { | 183           'variables': { | 
| 180             'grit_grd_file': 'browser/browser_resources.grd', | 184             'grit_grd_file': 'browser/browser_resources.grd', | 
| 181             'grit_additional_defines': [ | 185             'grit_additional_defines': [ | 
| 182               '-E', 'about_credits_file=<(about_credits_file)', | 186               '-E', 'about_credits_file=<(about_credits_file)', | 
| 183               '-E', 'additional_modules_list_file=<(additional_modules_list_file
     )', | 187               '-E', 'additional_modules_list_file=<(additional_modules_list_file
     )', | 
| 184               '-E', 'omnibox_mojom_file=<(omnibox_mojom_file)', | 188               '-E', 'omnibox_mojom_file=<(omnibox_mojom_file)', | 
| 185             ], | 189             ], | 
| 186           }, | 190           }, | 
| 187           'includes': [ '../build/grit_action.gypi' ], | 191           'includes': [ '../build/grit_action.gypi' ], | 
| 188         }, | 192         }, | 
| 189         { | 193         { | 
|  | 194           # GN version: //chrome/common:resources | 
| 190           'action_name': 'generate_common_resources', | 195           'action_name': 'generate_common_resources', | 
| 191           'variables': { | 196           'variables': { | 
| 192             'grit_grd_file': 'common/common_resources.grd', | 197             'grit_grd_file': 'common/common_resources.grd', | 
| 193           }, | 198           }, | 
| 194           'includes': [ '../build/grit_action.gypi' ], | 199           'includes': [ '../build/grit_action.gypi' ], | 
| 195         }, | 200         }, | 
| 196         { | 201         { | 
|  | 202           # GN version: //chrome/renderer:resources | 
| 197           'action_name': 'generate_renderer_resources', | 203           'action_name': 'generate_renderer_resources', | 
| 198           'variables': { | 204           'variables': { | 
| 199             'grit_grd_file': 'renderer/resources/renderer_resources.grd', | 205             'grit_grd_file': 'renderer/resources/renderer_resources.grd', | 
| 200           }, | 206           }, | 
| 201           'includes': [ '../build/grit_action.gypi' ], | 207           'includes': [ '../build/grit_action.gypi' ], | 
| 202         }, | 208         }, | 
| 203       ], | 209       ], | 
| 204       'conditions': [ | 210       'conditions': [ | 
| 205         ['enable_extensions==1', { | 211         ['enable_extensions==1', { | 
| 206           'actions': [ | 212           'actions': [ | 
| 207             { | 213             { | 
|  | 214               # GN version: //chrome/common:extensions_api_resources | 
| 208               'action_name': 'generate_extensions_api_resources', | 215               'action_name': 'generate_extensions_api_resources', | 
| 209               'variables': { | 216               'variables': { | 
| 210                 'grit_grd_file': 'common/extensions_api_resources.grd', | 217                 'grit_grd_file': 'common/extensions_api_resources.grd', | 
| 211               }, | 218               }, | 
| 212               'includes': [ '../build/grit_action.gypi' ], | 219               'includes': [ '../build/grit_action.gypi' ], | 
| 213             } | 220             } | 
| 214           ], | 221           ], | 
| 215         }], | 222         }], | 
| 216       ], | 223       ], | 
| 217       'includes': [ '../build/grit_target.gypi' ], | 224       'includes': [ '../build/grit_target.gypi' ], | 
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 495           'action_name': 'generate_chrome_unscaled_resources', | 502           'action_name': 'generate_chrome_unscaled_resources', | 
| 496           'variables': { | 503           'variables': { | 
| 497             'grit_grd_file': 'app/theme/chrome_unscaled_resources.grd', | 504             'grit_grd_file': 'app/theme/chrome_unscaled_resources.grd', | 
| 498           }, | 505           }, | 
| 499           'includes': [ '../build/grit_action.gypi' ], | 506           'includes': [ '../build/grit_action.gypi' ], | 
| 500         }, | 507         }, | 
| 501       ], | 508       ], | 
| 502       'includes': [ '../build/grit_target.gypi' ], | 509       'includes': [ '../build/grit_target.gypi' ], | 
| 503     }, | 510     }, | 
| 504     { | 511     { | 
|  | 512       # GN version: //chrome/browser:about_credits | 
| 505       'target_name': 'about_credits', | 513       'target_name': 'about_credits', | 
| 506       'type': 'none', | 514       'type': 'none', | 
| 507       'actions': [ | 515       'actions': [ | 
| 508         { | 516         { | 
| 509           'variables': { | 517           'variables': { | 
| 510             'generator_path': '../tools/licenses.py', | 518             'generator_path': '../tools/licenses.py', | 
| 511           }, | 519           }, | 
| 512           'action_name': 'generate_about_credits', | 520           'action_name': 'generate_about_credits', | 
| 513           'inputs': [ | 521           'inputs': [ | 
| 514             # TODO(phajdan.jr): make licenses.py print inputs too. | 522             # TODO(phajdan.jr): make licenses.py print inputs too. | 
| 515             '<(generator_path)', | 523             '<(generator_path)', | 
| 516           ], | 524           ], | 
| 517           'outputs': [ | 525           'outputs': [ | 
| 518             '<(about_credits_file)', | 526             '<(about_credits_file)', | 
| 519           ], | 527           ], | 
| 520           'hard_dependency': 1, | 528           'hard_dependency': 1, | 
| 521           'action': ['python', | 529           'action': ['python', | 
| 522                      '<(generator_path)', | 530                      '<(generator_path)', | 
| 523                      'credits', | 531                      'credits', | 
| 524                      '<(about_credits_file)', | 532                      '<(about_credits_file)', | 
| 525           ], | 533           ], | 
| 526           'message': 'Generating about:credits', | 534           'message': 'Generating about:credits', | 
| 527         }, | 535         }, | 
| 528       ], | 536       ], | 
| 529     }, | 537     }, | 
| 530   ], # targets | 538   ], # targets | 
| 531 } | 539 } | 
| OLD | NEW | 
|---|