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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 12315062: Disable Chrome Frame in Win64 build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« build/all.gyp ('K') | « chrome/chrome.gyp ('k') | no next file » | 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 { 5 {
6 'variables': { 6 'variables': {
7 'lastchange_path': '../build/util/LASTCHANGE', 7 'lastchange_path': '../build/util/LASTCHANGE',
8 # 'branding_dir' is set in the 'conditions' section at the bottom. 8 # 'branding_dir' is set in the 'conditions' section at the bottom.
9 }, 9 },
10 'conditions': [ 10 'conditions': [
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 'installer/setup/uninstall.h', 284 'installer/setup/uninstall.h',
285 ], 285 ],
286 'msvs_settings': { 286 'msvs_settings': {
287 'VCLinkerTool': { 287 'VCLinkerTool': {
288 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 288 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
289 }, 289 },
290 'VCManifestTool': { 290 'VCManifestTool': {
291 'AdditionalManifestFiles': '$(ProjectDir)\\installer\\setup\\setup .exe.manifest', 291 'AdditionalManifestFiles': '$(ProjectDir)\\installer\\setup\\setup .exe.manifest',
292 }, 292 },
293 }, 293 },
294 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
295 'msvs_disabled_warnings': [ 4267, ],
robertshield 2013/02/25 00:37:36 Please update the CL description to include this,
jschuh 2013/02/25 01:10:02 Oh. This must have been sitting as a local change
294 'rules': [ 296 'rules': [
295 { 297 {
296 'rule_name': 'setup_version', 298 'rule_name': 'setup_version',
297 'extension': 'version', 299 'extension': 'version',
298 'variables': { 300 'variables': {
299 'version_py_path': '../chrome/tools/build/version.py', 301 'version_py_path': '../chrome/tools/build/version.py',
300 'template_input_path': 'installer/setup/setup_exe_version.rc.ver sion', 302 'template_input_path': 'installer/setup/setup_exe_version.rc.ver sion',
301 }, 303 },
302 'inputs': [ 304 'inputs': [
303 '<(template_input_path)', 305 '<(template_input_path)',
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 'variables': { 367 'variables': {
366 'branding_dir': 'app/theme/google_chrome', 368 'branding_dir': 'app/theme/google_chrome',
367 'branding_dir_100': 'app/theme/default_100_percent/google_chrom e', 369 'branding_dir_100': 'app/theme/default_100_percent/google_chrom e',
368 }, 370 },
369 }, { # else branding!="Chrome" 371 }, { # else branding!="Chrome"
370 'variables': { 372 'variables': {
371 'branding_dir': 'app/theme/chromium', 373 'branding_dir': 'app/theme/chromium',
372 'branding_dir_100': 'app/theme/default_100_percent/chromium', 374 'branding_dir_100': 'app/theme/default_100_percent/chromium',
373 }, 375 },
374 }], 376 }],
375 ['use_aura==1', { 377 ['use_aura==1 or target_arch=="x64"', {
376 'dependencies!': [ 378 'dependencies!': [
377 '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', 379 '../chrome_frame/chrome_frame.gyp:chrome_tab_idl',
378 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 380 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
379 ], 381 ],
380 'defines': [ 382 'defines': [
381 'OMIT_CHROME_FRAME', 383 'OMIT_CHROME_FRAME',
382 ], 384 ],
383 }], 385 }],
384 ], 386 ],
385 }, 387 },
(...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
1197 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1199 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1198 }, 1200 },
1199 }, { # else branding!="Chrome" 1201 }, { # else branding!="Chrome"
1200 'variables': { 1202 'variables': {
1201 'branding_dir': 'app/theme/chromium', 1203 'branding_dir': 'app/theme/chromium',
1202 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1204 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1203 }, 1205 },
1204 }], 1206 }],
1205 ], 1207 ],
1206 } 1208 }
OLDNEW
« build/all.gyp ('K') | « chrome/chrome.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698