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

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: Replace existing base_nacl_win64 target with the new target. 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
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 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 ], 493 ],
494 'direct_dependent_settings': { 494 'direct_dependent_settings': {
495 'include_dirs': [ 495 'include_dirs': [
496 '..', 496 '..',
497 ], 497 ],
498 }, 498 },
499 'defines': [ 499 'defines': [
500 '<@(nacl_win64_defines)', 500 '<@(nacl_win64_defines)',
501 ], 501 ],
502 'dependencies': [ 502 'dependencies': [
503 '<(DEPTH)/base/base.gyp:base_nacl_win64', 503 '<(DEPTH)/base/base.gyp:base_win64',
504 ], 504 ],
505 'configurations': { 505 'configurations': {
506 'Common_Base': { 506 'Common_Base': {
507 'msvs_target_platform': 'x64', 507 'msvs_target_platform': 'x64',
508 }, 508 },
509 }, 509 },
510 'sources': [ 510 'sources': [
511 'installer/launcher_support/chrome_launcher_support.cc', 511 'installer/launcher_support/chrome_launcher_support.cc',
512 'installer/launcher_support/chrome_launcher_support.h', 512 'installer/launcher_support/chrome_launcher_support.h',
513 ], 513 ],
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
1224 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1224 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1225 }, 1225 },
1226 }, { # else branding!="Chrome" 1226 }, { # else branding!="Chrome"
1227 'variables': { 1227 'variables': {
1228 'branding_dir': 'app/theme/chromium', 1228 'branding_dir': 'app/theme/chromium',
1229 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1229 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1230 }, 1230 },
1231 }], 1231 }],
1232 ], 1232 ],
1233 } 1233 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698