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

Side by Side Diff: chrome/chrome_installer_static.gypi

Issue 2017853002: Add functionality to the install_static library to tokenize strings and compare versions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add install_static_unittests to other windows bots Created 4 years, 6 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
OLDNEW
1 # Copyright 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 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 # The install_static_util target should only depend on functions in kernel32 5 # The install_static_util target should only depend on functions in kernel32
6 # and advapi32. Please don't add dependencies on other system libraries. 6 # and advapi32. Please don't add dependencies on other system libraries.
7 { 7 {
8 'target_defaults': { 8 'target_defaults': {
9 'variables': { 9 'variables': {
10 'installer_static_target': 0, 10 'installer_static_target': 0,
(...skipping 28 matching lines...) Expand all
39 'msvs_settings': { 39 'msvs_settings': {
40 'VCLinkerTool': { 40 'VCLinkerTool': {
41 # Please don't add dependencies on other system libraries. 41 # Please don't add dependencies on other system libraries.
42 'AdditionalDependencies': [ 42 'AdditionalDependencies': [
43 'kernel32.lib', 43 'kernel32.lib',
44 'advapi32.lib', 44 'advapi32.lib',
45 ], 45 ],
46 }, 46 },
47 }, 47 },
48 }, 48 },
49 {
50 'target_name': 'install_static_unittests',
51 'type': 'executable',
52 'sources': [
53 'install_static/install_util_unittest.cc',
54 ],
55 'include_dirs': [
56 '..',
57 '<(SHARED_INTERMEDIATE_DIR)',
58 ],
59 'dependencies': [
60 '../base/base.gyp:base',
61 '../base/base.gyp:run_all_unittests',
62 '../base/base.gyp:test_support_base',
63 'chrome.gyp:install_static_util',
64 '../testing/gmock.gyp:gmock',
65 '../testing/gtest.gyp:gtest',
66 ],
67 },
49 ], 68 ],
50 }], 69 }],
70 ['OS=="win" and test_isolation_mode != "noop"', {
71 'targets': [
72 {
73 'target_name': 'install_static_unittests_run',
74 'type': 'none',
75 'dependencies': [
76 'install_static_unittests',
77 ],
78 'includes': [ '../build/isolate.gypi' ],
79 'sources': [
80 'install_static/install_static_unittests.isolate'
81 ],
82 },
83 ],
84 }],
51 ['OS=="win" and target_arch=="ia32"', { 85 ['OS=="win" and target_arch=="ia32"', {
52 'targets': [ 86 'targets': [
53 { 87 {
54 'target_name': 'install_static_util_nacl_win64', 88 'target_name': 'install_static_util_nacl_win64',
55 'type': 'static_library', 89 'type': 'static_library',
56 'variables': { 90 'variables': {
57 'installer_static_target': 1, 91 'installer_static_target': 1,
58 }, 92 },
59 'dependencies': [ 93 'dependencies': [
60 'installer_util_strings', 94 'installer_util_strings',
(...skipping 13 matching lines...) Expand all
74 'kernel32.lib', 108 'kernel32.lib',
75 'advapi32.lib', 109 'advapi32.lib',
76 ], 110 ],
77 }, 111 },
78 }, 112 },
79 }, 113 },
80 ], 114 ],
81 }], 115 }],
82 ], 116 ],
83 } 117 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698