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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 1212163010: GN support for setup_unittests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@iwt
Patch Set: both_gn_and_gyp Created 5 years, 5 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 | « build/gn_migration.gypi ('k') | chrome/installer/setup/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) 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 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 ['target_arch=="ia32"', { 299 ['target_arch=="ia32"', {
300 'msvs_settings': { 300 'msvs_settings': {
301 'VCCLCompilerTool': { 301 'VCCLCompilerTool': {
302 'EnableEnhancedInstructionSet': '4', # NoExtensions 302 'EnableEnhancedInstructionSet': '4', # NoExtensions
303 }, 303 },
304 }, 304 },
305 }], 305 }],
306 ], 306 ],
307 }, 307 },
308 { 308 {
309 # GN version: //chrome/installer/setup:setup_unittests
309 'target_name': 'setup_unittests', 310 'target_name': 'setup_unittests',
310 'type': 'executable', 311 'type': 'executable',
311 'dependencies': [ 312 'dependencies': [
312 'installer_util', 313 'installer_util',
313 'installer_util_strings', 314 'installer_util_strings',
314 '../base/base.gyp:base', 315 '../base/base.gyp:base',
315 '../base/base.gyp:base_i18n', 316 '../base/base.gyp:base_i18n',
316 '../base/base.gyp:test_support_base', 317 '../base/base.gyp:test_support_base',
317 '../testing/gmock.gyp:gmock', 318 '../testing/gmock.gyp:gmock',
318 '../testing/gtest.gyp:gtest', 319 '../testing/gtest.gyp:gtest',
319 ], 320 ],
320 'include_dirs': [ 321 'include_dirs': [
321 '..', 322 '..',
322 '<(INTERMEDIATE_DIR)', 323 '<(INTERMEDIATE_DIR)',
323 ], 324 ],
324 # TODO(robertshield): Move the items marked with "Move to lib" 325 # TODO(robertshield): Move the items marked with "Move to lib"
325 # below into a separate lib and then link both setup.exe and 326 # below into a separate lib and then link both setup.exe and
326 # setup_unittests.exe against that. 327 # setup_unittests.exe against that.
327 'sources': [ 328 'sources': [
329 '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util/installer_util_str ings.rc',
328 'installer/mini_installer/chrome.release', # Move to lib 330 'installer/mini_installer/chrome.release', # Move to lib
329 'installer/mini_installer/appid.h', 331 'installer/mini_installer/appid.h',
330 'installer/mini_installer/chrome_appid.cc', 332 'installer/mini_installer/chrome_appid.cc',
331 'installer/mini_installer/configuration.cc', 333 'installer/mini_installer/configuration.cc',
332 'installer/mini_installer/configuration.h', 334 'installer/mini_installer/configuration.h',
333 'installer/mini_installer/configuration_test.cc', 335 'installer/mini_installer/configuration_test.cc',
334 'installer/mini_installer/decompress.cc', 336 'installer/mini_installer/decompress.cc',
335 'installer/mini_installer/decompress.h', 337 'installer/mini_installer/decompress.h',
336 'installer/mini_installer/decompress_test.cc', 338 'installer/mini_installer/decompress_test.cc',
337 'installer/mini_installer/mini_string.cc', 339 'installer/mini_installer/mini_string.cc',
338 'installer/mini_installer/mini_string.h', 340 'installer/mini_installer/mini_string.h',
339 'installer/mini_installer/mini_string_test.cc', 341 'installer/mini_installer/mini_string_test.cc',
340 'installer/setup/app_launcher_installer.cc', # Move to lib 342 'installer/setup/app_launcher_installer.cc', # Move to lib
341 'installer/setup/app_launcher_installer.h', # Move to lib 343 'installer/setup/app_launcher_installer.h', # Move to lib
342 'installer/setup/archive_patch_helper.cc', # Move to lib 344 'installer/setup/archive_patch_helper.cc', # Move to lib
343 'installer/setup/archive_patch_helper.h', # Move to lib 345 'installer/setup/archive_patch_helper.h', # Move to lib
344 'installer/setup/archive_patch_helper_unittest.cc', 346 'installer/setup/archive_patch_helper_unittest.cc',
345 'installer/setup/install.cc', # Move to lib 347 'installer/setup/install.cc', # Move to lib
346 'installer/setup/install.h', # Move to lib 348 'installer/setup/install.h', # Move to lib
347 'installer/setup/install_unittest.cc', 349 'installer/setup/install_unittest.cc',
348 'installer/setup/install_worker.cc', # Move to lib 350 'installer/setup/install_worker.cc', # Move to lib
349 'installer/setup/install_worker.h', # Move to lib 351 'installer/setup/install_worker.h', # Move to lib
350 'installer/setup/install_worker_unittest.cc', 352 'installer/setup/install_worker_unittest.cc',
351 'installer/setup/run_all_unittests.cc', 353 'installer/setup/run_all_unittests.cc',
352 'installer/setup/setup_constants.cc', # Move to lib 354 'installer/setup/setup_constants.cc', # Move to lib
353 'installer/setup/setup_constants.h', # Move to lib 355 'installer/setup/setup_constants.h', # Move to lib
354 'installer/setup/setup_unittests.rc',
355 'installer/setup/setup_unittests_resource.h',
356 'installer/setup/setup_util.cc', 356 'installer/setup/setup_util.cc',
357 'installer/setup/setup_util_unittest.cc', 357 'installer/setup/setup_util_unittest.cc',
358 'installer/setup/setup_util_unittest.h', 358 'installer/setup/setup_util_unittest.h',
359 ], 359 ],
360 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 360 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
361 'msvs_disabled_warnings': [ 4267, ], 361 'msvs_disabled_warnings': [ 4267, ],
362 }, 362 },
363 ], 363 ],
364 }], 364 }],
365 ['OS=="win" and target_arch=="ia32"', { 365 ['OS=="win" and target_arch=="ia32"', {
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
1063 '..', 1063 '..',
1064 ], 1064 ],
1065 'sources': [ 1065 'sources': [
1066 'installer/gcapi_mac/gcapi_example_client.mm', 1066 'installer/gcapi_mac/gcapi_example_client.mm',
1067 ], 1067 ],
1068 }, 1068 },
1069 ], # targets 1069 ], # targets
1070 }], # OS=="mac" 1070 }], # OS=="mac"
1071 ], 1071 ],
1072 } 1072 }
OLDNEW
« no previous file with comments | « build/gn_migration.gypi ('k') | chrome/installer/setup/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698