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

Side by Side Diff: build/chrome_settings.gypi

Issue 1419503006: fix breaking third parties using grit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « no previous file | build/grit_action.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 # This file contains settings for ../chrome/chrome.gyp that other gyp files 5 # This file contains settings for ../chrome/chrome.gyp that other gyp files
6 # also use. 6 # also use.
7 { 7 {
8 'variables': { 8 'variables': {
9 # TODO: remove this helper when we have loops in GYP 9 # TODO: remove this helper when we have loops in GYP
10 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'], 10 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'],
11 'grit_defines': ['-D', 'version=<(version_full)'],
12 'includes': ['util/version.gypi'],
11 13
12 'conditions': [ 14 'conditions': [
13 ['OS=="mac"', { 15 ['OS=="mac"', {
14 'conditions': [ 16 'conditions': [
15 ['branding=="Chrome"', { 17 ['branding=="Chrome"', {
16 'mac_bundle_id': 'com.google.Chrome', 18 'mac_bundle_id': 'com.google.Chrome',
17 'mac_creator': 'rimZ', 19 'mac_creator': 'rimZ',
18 # The policy .grd file also needs the bundle id. 20 # The policy .grd file also needs the bundle id.
19 'grit_defines': ['-D', 'mac_bundle_id=com.google.Chrome'], 21 'grit_defines': ['-D', 'mac_bundle_id=com.google.Chrome'],
20 }, { # else: branding!="Chrome" 22 }, { # else: branding!="Chrome"
21 'mac_bundle_id': 'org.chromium.Chromium', 23 'mac_bundle_id': 'org.chromium.Chromium',
22 'mac_creator': 'Cr24', 24 'mac_creator': 'Cr24',
23 # The policy .grd file also needs the bundle id. 25 # The policy .grd file also needs the bundle id.
24 'grit_defines': ['-D', 'mac_bundle_id=org.chromium.Chromium'], 26 'grit_defines': ['-D', 'mac_bundle_id=org.chromium.Chromium'],
25 }], # branding 27 }], # branding
26 ], # conditions 28 ], # conditions
27 }], # OS=="mac" 29 }], # OS=="mac"
28 ], # conditions 30 ], # conditions
29 }, # variables 31 }, # variables
30 } 32 }
OLDNEW
« no previous file with comments | « no previous file | build/grit_action.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698