| 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 'includes': [ | 5 'includes': [ |
| 6 'chrome_features.gypi', | 6 'chrome_features.gypi', |
| 7 ], | 7 ], |
| 8 'variables': { | 8 'variables': { |
| 9 # Apply Chrome-specific grit settings to all grit actions in this file. | 9 # Apply Chrome-specific grit settings to all grit actions in this file. |
| 10 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 10 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 'chrome_internal_resources_gen', | 196 'chrome_internal_resources_gen', |
| 197 'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings', | 197 'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings', |
| 198 ], | 198 ], |
| 199 'actions': [ | 199 'actions': [ |
| 200 { | 200 { |
| 201 # GN version: //chrome/browser:resources | 201 # GN version: //chrome/browser:resources |
| 202 'action_name': 'generate_browser_resources', | 202 'action_name': 'generate_browser_resources', |
| 203 'variables': { | 203 'variables': { |
| 204 'grit_grd_file': 'browser/browser_resources.grd', | 204 'grit_grd_file': 'browser/browser_resources.grd', |
| 205 'grit_additional_defines': [ | 205 'grit_additional_defines': [ |
| 206 # TODO(dbeam): 'chrome_grit_defines' should just be appended to |
| 207 # this list of 'grit_additional_defines' via the top of this file, |
| 208 # but they're not for some reason. Maybe because they're in |
| 209 # different scopes? |
| 210 '<@(chrome_grit_defines)', |
| 206 '-E', 'additional_modules_list_file=<(additional_modules_list_file
)', | 211 '-E', 'additional_modules_list_file=<(additional_modules_list_file
)', |
| 207 '-E', 'root_gen_dir=<(SHARED_INTERMEDIATE_DIR)', | 212 '-E', 'root_gen_dir=<(SHARED_INTERMEDIATE_DIR)', |
| 208 ], | 213 ], |
| 209 }, | 214 }, |
| 210 'includes': [ '../build/grit_action.gypi' ], | 215 'includes': [ '../build/grit_action.gypi' ], |
| 211 }, | 216 }, |
| 212 { | 217 { |
| 213 # GN version: //chrome/common:resources | 218 # GN version: //chrome/common:resources |
| 214 'action_name': 'generate_common_resources', | 219 'action_name': 'generate_common_resources', |
| 215 'variables': { | 220 'variables': { |
| (...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 698 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak', | 703 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak', |
| 699 ], | 704 ], |
| 700 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak', | 705 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak', |
| 701 }, | 706 }, |
| 702 'includes': [ '../build/repack_action.gypi' ], | 707 'includes': [ '../build/repack_action.gypi' ], |
| 703 }, | 708 }, |
| 704 ], | 709 ], |
| 705 }, | 710 }, |
| 706 ], # targets | 711 ], # targets |
| 707 } | 712 } |
| OLD | NEW |