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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 103333004: Allow Win64 build of base library even in a Win32 build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Base Win64: Address CR feedback Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/common_constants.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 # 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 'libpeer_target_type%': 'static_library', 8 'libpeer_target_type%': 'static_library',
9 # 'branding_dir' is set in the 'conditions' section at the bottom. 9 # 'branding_dir' is set in the 'conditions' section at the bottom.
10 }, 10 },
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 ], 489 ],
490 'direct_dependent_settings': { 490 'direct_dependent_settings': {
491 'include_dirs': [ 491 'include_dirs': [
492 '..', 492 '..',
493 ], 493 ],
494 }, 494 },
495 'defines': [ 495 'defines': [
496 '<@(nacl_win64_defines)', 496 '<@(nacl_win64_defines)',
497 ], 497 ],
498 'dependencies': [ 498 'dependencies': [
499 '<(DEPTH)/base/base.gyp:base_nacl_win64', 499 '<(DEPTH)/base/base.gyp:base_win64',
500 ], 500 ],
501 'configurations': { 501 'configurations': {
502 'Common_Base': { 502 'Common_Base': {
503 'msvs_target_platform': 'x64', 503 'msvs_target_platform': 'x64',
504 }, 504 },
505 }, 505 },
506 'sources': [ 506 'sources': [
507 'installer/launcher_support/chrome_launcher_support.cc', 507 'installer/launcher_support/chrome_launcher_support.cc',
508 'installer/launcher_support/chrome_launcher_support.h', 508 'installer/launcher_support/chrome_launcher_support.h',
509 ], 509 ],
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
1220 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1220 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1221 }, 1221 },
1222 }, { # else branding!="Chrome" 1222 }, { # else branding!="Chrome"
1223 'variables': { 1223 'variables': {
1224 'branding_dir': 'app/theme/chromium', 1224 'branding_dir': 'app/theme/chromium',
1225 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1225 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1226 }, 1226 },
1227 }], 1227 }],
1228 ], 1228 ],
1229 } 1229 }
OLDNEW
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/common_constants.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698