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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 1475883002: Revert of New build flag system, convert Google Now flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 unified diff | Download patch
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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': [
6 'chrome_features.gypi',
7 ],
8 'variables': { 5 'variables': {
9 # Apply Chrome-specific grit settings to all grit actions in this file.
10 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
11 'grit_additional_defines': [ '<@(chrome_grit_defines)' ],
12
13 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt', 7 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt',
14 }, 8 },
15 'targets': [ 9 'targets': [
16 { 10 {
17 # GN version: //chrome:extra_resources 11 # GN version: //chrome:extra_resources
18 'target_name': 'chrome_extra_resources', 12 'target_name': 'chrome_extra_resources',
19 'type': 'none', 13 'type': 'none',
20 # These resources end up in resources.pak because they are resources 14 # These resources end up in resources.pak because they are resources
21 # used by internal pages. Putting them in a separate pak file makes 15 # used by internal pages. Putting them in a separate pak file makes
22 # it easier for us to reference them internally. 16 # it easier for us to reference them internally.
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak', 684 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak',
691 ], 685 ],
692 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak', 686 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak',
693 }, 687 },
694 'includes': [ '../build/repack_action.gypi' ], 688 'includes': [ '../build/repack_action.gypi' ],
695 }, 689 },
696 ], 690 ],
697 }, 691 },
698 ], # targets 692 ], # targets
699 } 693 }
OLDNEW
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698