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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 1062743006: Add installer_util_unittests to the GN windows build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wintests3
Patch Set: Fixes 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/chrome.gyp ('k') | chrome/installer/setup/app_launcher_installer.cc » ('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) 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': 'app/theme/<(branding_path_component)', 9 'branding_dir': 'app/theme/<(branding_path_component)',
10 'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component )', 10 'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component )',
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 'installer/gcapi/gcapi_omaha_experiment_test.cc', 69 'installer/gcapi/gcapi_omaha_experiment_test.cc',
70 'installer/gcapi/gcapi_reactivation_test.cc', 70 'installer/gcapi/gcapi_reactivation_test.cc',
71 'installer/gcapi/gcapi_test.cc', 71 'installer/gcapi/gcapi_test.cc',
72 'installer/gcapi/gcapi_test.rc', 72 'installer/gcapi/gcapi_test.rc',
73 'installer/gcapi/gcapi_test_registry_overrider.cc', 73 'installer/gcapi/gcapi_test_registry_overrider.cc',
74 'installer/gcapi/gcapi_test_registry_overrider.h', 74 'installer/gcapi/gcapi_test_registry_overrider.h',
75 'installer/gcapi/resource.h', 75 'installer/gcapi/resource.h',
76 ], 76 ],
77 }, 77 },
78 { 78 {
79 # GN version: //chrome/installer/util:installer_util_unittests
79 'target_name': 'installer_util_unittests', 80 'target_name': 'installer_util_unittests',
80 'type': 'executable', 81 'type': 'executable',
81 'dependencies': [ 82 'dependencies': [
82 'installer_util', 83 'installer_util',
83 'installer_util_strings', 84 'installer_util_strings',
84 'installer/upgrade_test.gyp:alternate_version_generator_lib', 85 'installer/upgrade_test.gyp:alternate_version_generator_lib',
85 '../base/base.gyp:base', 86 '../base/base.gyp:base',
86 '../base/base.gyp:base_i18n', 87 '../base/base.gyp:base_i18n',
87 '../base/base.gyp:test_support_base', 88 '../base/base.gyp:test_support_base',
88 '../chrome/chrome.gyp:chrome_version_resources', 89 '../chrome/chrome.gyp:chrome_version_resources',
89 '../content/content.gyp:content_common', 90 '../content/content.gyp:content_common',
90 '../testing/gmock.gyp:gmock', 91 '../testing/gmock.gyp:gmock',
91 '../testing/gtest.gyp:gtest', 92 '../testing/gtest.gyp:gtest',
92 ], 93 ],
93 'include_dirs': [ 94 'include_dirs': [
94 '..', 95 '..',
95 ], 96 ],
96 'sources': [ 97 'sources': [
98 # List duplicated in GN build.
97 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 99 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
98 'installer/setup/compat_checks_unittest.cc', 100 'installer/setup/compat_checks_unittest.cc',
99 'installer/setup/setup_constants.cc', 101 'installer/setup/setup_constants.cc',
100 'installer/util/advanced_firewall_manager_win_unittest.cc', 102 'installer/util/advanced_firewall_manager_win_unittest.cc',
101 'installer/util/callback_work_item_unittest.cc', 103 'installer/util/callback_work_item_unittest.cc',
102 'installer/util/channel_info_unittest.cc', 104 'installer/util/channel_info_unittest.cc',
103 'installer/util/copy_tree_work_item_unittest.cc', 105 'installer/util/copy_tree_work_item_unittest.cc',
104 'installer/util/create_dir_work_item_unittest.cc', 106 'installer/util/create_dir_work_item_unittest.cc',
105 'installer/util/create_reg_key_work_item_unittest.cc', 107 'installer/util/create_reg_key_work_item_unittest.cc',
106 'installer/util/delete_after_reboot_helper_unittest.cc', 108 'installer/util/delete_after_reboot_helper_unittest.cc',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 { 155 {
154 # GN version: //chrome/installer/util:strings 156 # GN version: //chrome/installer/util:strings
155 'target_name': 'installer_util_strings', 157 'target_name': 'installer_util_strings',
156 'type': 'none', 158 'type': 'none',
157 'actions': [ 159 'actions': [
158 { 160 {
159 'action_name': 'installer_util_strings', 161 'action_name': 'installer_util_strings',
160 'variables': { 162 'variables': {
161 'create_string_rc_py': 'installer/util/prebuild/create_string_rc .py', 163 'create_string_rc_py': 'installer/util/prebuild/create_string_rc .py',
162 'brand_strings': '<(branding_path_component)_strings', 164 'brand_strings': '<(branding_path_component)_strings',
165 'gen_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util',
163 }, 166 },
164 167
165 'inputs': [ 168 'inputs': [
166 '<(create_string_rc_py)', 169 '<(create_string_rc_py)',
167 'app/<(brand_strings).grd', 170 'app/<(brand_strings).grd',
168 ], 171 ],
169 'outputs': [ 172 'outputs': [
170 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_uti l_strings.h', 173 '<(gen_dir)/installer_util_strings.h',
171 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_uti l_strings.rc', 174 '<(gen_dir)/installer_util_strings.rc',
172 ], 175 ],
173 'action': ['python', 176 'action': ['python',
174 '<(create_string_rc_py)', 177 '<(create_string_rc_py)',
175 '-i', 'app/<(brand_strings).grd:resources', 178 '-i', 'app/<(brand_strings).grd:resources',
176 '-n', 'installer_util_strings', 179 '-n', 'installer_util_strings',
177 '-o', '<(SHARED_INTERMEDIATE_DIR)/installer_util_string s',], 180 '-o', '<(gen_dir)',],
178 'message': 'Generating installer_util_strings', 181 'message': 'Generating installer_util_strings',
179 }, 182 },
180 ], 183 ],
181 'direct_dependent_settings': { 184 'direct_dependent_settings': {
182 'include_dirs': [ 185 'include_dirs': [
183 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings', 186 '<(SHARED_INTERMEDIATE_DIR)',
184 ], 187 ],
185 }, 188 },
186 }, 189 },
187 { 190 {
188 # GN version: //chrome/installer/launcher_support 191 # GN version: //chrome/installer/launcher_support
189 'target_name': 'launcher_support', 192 'target_name': 'launcher_support',
190 'type': 'static_library', 193 'type': 'static_library',
191 'include_dirs': [ 194 'include_dirs': [
192 '..', 195 '..',
193 ], 196 ],
(...skipping 27 matching lines...) Expand all
221 '..', 224 '..',
222 '<(INTERMEDIATE_DIR)', 225 '<(INTERMEDIATE_DIR)',
223 '<(SHARED_INTERMEDIATE_DIR)/setup', 226 '<(SHARED_INTERMEDIATE_DIR)/setup',
224 ], 227 ],
225 'direct_dependent_settings': { 228 'direct_dependent_settings': {
226 'include_dirs': [ 229 'include_dirs': [
227 '<(SHARED_INTERMEDIATE_DIR)/setup', 230 '<(SHARED_INTERMEDIATE_DIR)/setup',
228 ], 231 ],
229 }, 232 },
230 'sources': [ 233 'sources': [
231 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_st rings.rc', 234 '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util/installer_util_str ings.rc',
232 'installer/mini_installer/chrome.release', 235 'installer/mini_installer/chrome.release',
233 'installer/setup/app_launcher_installer.cc', 236 'installer/setup/app_launcher_installer.cc',
234 'installer/setup/app_launcher_installer.h', 237 'installer/setup/app_launcher_installer.h',
235 'installer/setup/archive_patch_helper.cc', 238 'installer/setup/archive_patch_helper.cc',
236 'installer/setup/archive_patch_helper.h', 239 'installer/setup/archive_patch_helper.h',
237 'installer/setup/install.cc', 240 'installer/setup/install.cc',
238 'installer/setup/install.h', 241 'installer/setup/install.h',
239 'installer/setup/install_worker.cc', 242 'installer/setup/install_worker.cc',
240 'installer/setup/install_worker.h', 243 'installer/setup/install_worker.h',
241 'installer/setup/setup.ico', 244 'installer/setup/setup.ico',
(...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 '..', 1064 '..',
1062 ], 1065 ],
1063 'sources': [ 1066 'sources': [
1064 'installer/gcapi_mac/gcapi_example_client.mm', 1067 'installer/gcapi_mac/gcapi_example_client.mm',
1065 ], 1068 ],
1066 }, 1069 },
1067 ], # targets 1070 ], # targets
1068 }], # OS=="mac" 1071 }], # OS=="mac"
1069 ], 1072 ],
1070 } 1073 }
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/installer/setup/app_launcher_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698