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

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

Issue 12213107: 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 | « no previous file | 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 20 matching lines...) Expand all
31 'sources': [ 31 'sources': [
32 'test/alternate_version_generator.cc', 32 'test/alternate_version_generator.cc',
33 'test/alternate_version_generator.h', 33 'test/alternate_version_generator.h',
34 'test/pe_image_resources.cc', 34 'test/pe_image_resources.cc',
35 'test/pe_image_resources.h', 35 'test/pe_image_resources.h',
36 'test/resource_loader.cc', 36 'test/resource_loader.cc',
37 'test/resource_loader.h', 37 'test/resource_loader.h',
38 'test/resource_updater.cc', 38 'test/resource_updater.cc',
39 'test/resource_updater.h', 39 'test/resource_updater.h',
40 ], 40 ],
41 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
42 'msvs_disabled_warnings': [4267, ],
41 }, 43 },
42 { 44 {
43 'target_name': 'upgrade_test', 45 'target_name': 'upgrade_test',
44 'type': 'executable', 46 'type': 'executable',
45 'dependencies': [ 47 'dependencies': [
46 'alternate_version_generator_lib', 48 'alternate_version_generator_lib',
47 # This dependency, although correct, results in the mini installer 49 # This dependency, although correct, results in the mini installer
48 # being rebuilt every time upgrade_test is built. So disable it 50 # being rebuilt every time upgrade_test is built. So disable it
49 # for now. 51 # for now.
50 # TODO(grt): fix rules/targets/etc for 52 # TODO(grt): fix rules/targets/etc for
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 'variables': { 91 'variables': {
90 'branding_dir': '../app/theme/google_chrome', 92 'branding_dir': '../app/theme/google_chrome',
91 }, 93 },
92 }, { # else branding!="Chrome" 94 }, { # else branding!="Chrome"
93 'variables': { 95 'variables': {
94 'branding_dir': '../app/theme/chromium', 96 'branding_dir': '../app/theme/chromium',
95 }, 97 },
96 }], 98 }],
97 ], 99 ],
98 } 100 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698