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

Side by Side Diff: chrome/installer/mini_installer.gyp

Issue 7706011: Use precompiled headers for most large projects. (Closed) Base URL: ssh://joi@192.168.1.201/home/joi/c/chrome/src@master
Patch Set: Merge to lkgr. Created 9 years, 3 months 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/default_plugin/default_plugin.gyp ('k') | chrome/installer/upgrade_test.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'version_py': '../../chrome/tools/build/version.py', 3 'version_py': '../../chrome/tools/build/version.py',
4 'version_path': '../../chrome/VERSION', 4 'version_path': '../../chrome/VERSION',
5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
6 # 'branding_dir' is set in the 'conditions' section at the bottom. 6 # 'branding_dir' is set in the 'conditions' section at the bottom.
7 'msvs_use_common_release': 0, 7 'msvs_use_common_release': 0,
8 'msvs_use_common_linker_extras': 0, 8 'msvs_use_common_linker_extras': 0,
9 }, 9 },
10 'includes': [
11 '../../build/win_precompile.gypi',
12 ],
10 'conditions': [ 13 'conditions': [
11 ['OS=="win"', { 14 ['OS=="win"', {
12 'target_defaults': { 15 'target_defaults': {
13 'dependencies': [ 16 'dependencies': [
14 '../chrome.gyp:chrome', 17 '../chrome.gyp:chrome',
15 '../chrome.gyp:chrome_nacl_win64', 18 '../chrome.gyp:chrome_nacl_win64',
16 '../chrome.gyp:chrome_dll', 19 '../chrome.gyp:chrome_dll',
17 '../chrome.gyp:default_extensions', 20 '../chrome.gyp:default_extensions',
18 '../chrome.gyp:setup', 21 '../chrome.gyp:setup',
19 ], 22 ],
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 'variables': { 229 'variables': {
227 'branding_dir': '../app/theme/google_chrome', 230 'branding_dir': '../app/theme/google_chrome',
228 }, 231 },
229 }, { # else branding!="Chrome" 232 }, { # else branding!="Chrome"
230 'variables': { 233 'variables': {
231 'branding_dir': '../app/theme/chromium', 234 'branding_dir': '../app/theme/chromium',
232 }, 235 },
233 }], 236 }],
234 ], 237 ],
235 } 238 }
OLDNEW
« no previous file with comments | « chrome/default_plugin/default_plugin.gyp ('k') | chrome/installer/upgrade_test.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698