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

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

Issue 1116263002: Revert of Add installer_util_unittests to the GN windows build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wintests3
Patch Set: Created 5 years, 7 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
« no previous file with comments | « chrome/installer/test/resource_updater.cc ('k') | chrome/installer/util/BUILD.gn » ('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) 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 'branding_dir': '../app/theme/<(branding_path_component)', 7 'branding_dir': '../app/theme/<(branding_path_component)',
8 'version_py': '<(DEPTH)/build/util/version.py', 8 'version_py': '<(DEPTH)/build/util/version.py',
9 'version_path': '../../chrome/VERSION', 9 'version_path': '../../chrome/VERSION',
10 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', 10 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
11 # 'branding_dir' is set in the 'conditions' section at the bottom. 11 # 'branding_dir' is set in the 'conditions' section at the bottom.
12 'msvs_use_common_release': 0, 12 'msvs_use_common_release': 0,
13 'msvs_use_common_linker_extras': 0, 13 'msvs_use_common_linker_extras': 0,
14 }, 14 },
15 'includes': [ 15 'includes': [
16 '../../build/win_precompile.gypi', 16 '../../build/win_precompile.gypi',
17 ], 17 ],
18 'conditions': [ 18 'conditions': [
19 ['OS=="win"', { 19 ['OS=="win"', {
20 'targets': [ 20 'targets': [
21 { 21 {
22 # GN version: //chrome/installer/test:alternate_version_generator_lib
23 'target_name': 'alternate_version_generator_lib', 22 'target_name': 'alternate_version_generator_lib',
24 'type': 'static_library', 23 'type': 'static_library',
25 'dependencies': [ 24 'dependencies': [
26 '../chrome.gyp:installer_util', 25 '../chrome.gyp:installer_util',
27 '../common_constants.gyp:common_constants', 26 '../common_constants.gyp:common_constants',
28 '../../base/base.gyp:base', 27 '../../base/base.gyp:base',
29 ], 28 ],
30 'include_dirs': [ 29 'include_dirs': [
31 '../..', 30 '../..',
32 ], 31 ],
33 'sources': [ 32 'sources': [
34 'test/alternate_version_generator.cc', 33 'test/alternate_version_generator.cc',
35 'test/alternate_version_generator.h', 34 'test/alternate_version_generator.h',
36 'test/pe_image_resources.cc', 35 'test/pe_image_resources.cc',
37 'test/pe_image_resources.h', 36 'test/pe_image_resources.h',
38 'test/resource_loader.cc', 37 'test/resource_loader.cc',
39 'test/resource_loader.h', 38 'test/resource_loader.h',
40 'test/resource_updater.cc', 39 'test/resource_updater.cc',
41 'test/resource_updater.h', 40 'test/resource_updater.h',
42 ], 41 ],
43 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 42 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
44 'msvs_disabled_warnings': [4267, ], 43 'msvs_disabled_warnings': [4267, ],
45 }, 44 },
46 { 45 {
47 # GN version: //chrome/installer/test:upgrade_test
48 'target_name': 'upgrade_test', 46 'target_name': 'upgrade_test',
49 'type': 'executable', 47 'type': 'executable',
50 'dependencies': [ 48 'dependencies': [
51 'alternate_version_generator_lib', 49 'alternate_version_generator_lib',
52 # This dependency, although correct, results in the mini installer 50 # This dependency, although correct, results in the mini installer
53 # being rebuilt every time upgrade_test is built. So disable it 51 # being rebuilt every time upgrade_test is built. So disable it
54 # for now. 52 # for now.
55 # TODO(grt): fix rules/targets/etc for 53 # TODO(grt): fix rules/targets/etc for
56 # mini_installer.gyp:mini_installer so that it does no work if 54 # mini_installer.gyp:mini_installer so that it does no work if
57 # nothing has changed, then un-comment this next line: 55 # nothing has changed, then un-comment this next line:
58 # 'mini_installer.gyp:mini_installer', 56 # 'mini_installer.gyp:mini_installer',
59 '../../base/base.gyp:test_support_base', 57 '../../base/base.gyp:test_support_base',
60 '../../testing/gtest.gyp:gtest', 58 '../../testing/gtest.gyp:gtest',
61 '../chrome.gyp:installer_util', 59 '../chrome.gyp:installer_util',
62 '../common_constants.gyp:common_constants', 60 '../common_constants.gyp:common_constants',
63 ], 61 ],
64 'include_dirs': [ 62 'include_dirs': [
65 '../..', 63 '../..',
66 ], 64 ],
67 'sources': [ 65 'sources': [
68 'test/run_all_tests.cc', 66 'test/run_all_tests.cc',
69 'test/upgrade_test.cc', 67 'test/upgrade_test.cc',
70 ], 68 ],
71 }, 69 },
72 { 70 {
73 # GN version: //chrome/installer/test:alternate_version_generator
74 'target_name': 'alternate_version_generator', 71 'target_name': 'alternate_version_generator',
75 'type': 'executable', 72 'type': 'executable',
76 'dependencies': [ 73 'dependencies': [
77 'alternate_version_generator_lib', 74 'alternate_version_generator_lib',
78 '../../base/base.gyp:test_support_base', 75 '../../base/base.gyp:test_support_base',
79 '../../testing/gtest.gyp:gtest', 76 '../../testing/gtest.gyp:gtest',
80 '../chrome.gyp:installer_util', 77 '../chrome.gyp:installer_util',
81 '../common_constants.gyp:common_constants', 78 '../common_constants.gyp:common_constants',
82 ], 79 ],
83 'include_dirs': [ 80 'include_dirs': [
84 '../..', 81 '../..',
85 ], 82 ],
86 'sources': [ 83 'sources': [
87 'test/alternate_version_generator_main.cc', 84 'test/alternate_version_generator_main.cc',
88 ], 85 ],
89 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 86 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
90 'msvs_disabled_warnings': [ 4267, ], 87 'msvs_disabled_warnings': [ 4267, ],
91 }, 88 },
92 ], 89 ],
93 }], 90 }],
94 ], 91 ],
95 } 92 }
OLDNEW
« no previous file with comments | « chrome/installer/test/resource_updater.cc ('k') | chrome/installer/util/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698