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

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

Issue 12207072: Make installer_util_unittests build on Win64 (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
« no previous file with comments | « chrome/chrome_installer.gypi ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'version_py': '../../chrome/tools/build/version.py', 7 'version_py': '../../chrome/tools/build/version.py',
8 'version_path': '../../chrome/VERSION', 8 'version_path': '../../chrome/VERSION',
9 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', 9 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
10 # 'branding_dir' is set in the 'conditions' section at the bottom. 10 # 'branding_dir' is set in the 'conditions' section at the bottom.
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 '../../testing/gtest.gyp:gtest', 73 '../../testing/gtest.gyp:gtest',
74 '../chrome.gyp:installer_util', 74 '../chrome.gyp:installer_util',
75 '../common_constants.gyp:common_constants', 75 '../common_constants.gyp:common_constants',
76 ], 76 ],
77 'include_dirs': [ 77 'include_dirs': [
78 '../..', 78 '../..',
79 ], 79 ],
80 'sources': [ 80 'sources': [
81 'test/alternate_version_generator_main.cc', 81 'test/alternate_version_generator_main.cc',
82 ], 82 ],
83 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
84 'msvs_disabled_warnings': [ 4267, ],
83 }, 85 },
84 ], 86 ],
85 }], 87 }],
86 [ 'branding == "Chrome"', { 88 [ 'branding == "Chrome"', {
87 'variables': { 89 'variables': {
88 'branding_dir': '../app/theme/google_chrome', 90 'branding_dir': '../app/theme/google_chrome',
89 }, 91 },
90 }, { # else branding!="Chrome" 92 }, { # else branding!="Chrome"
91 'variables': { 93 'variables': {
92 'branding_dir': '../app/theme/chromium', 94 'branding_dir': '../app/theme/chromium',
93 }, 95 },
94 }], 96 }],
95 ], 97 ],
96 } 98 }
OLDNEW
« no previous file with comments | « chrome/chrome_installer.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698