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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pure rebase Created 4 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
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/chrome_tests.gypi » ('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 'branding_dir': 'app/theme/<(branding_path_component)', 8 'branding_dir': 'app/theme/<(branding_path_component)',
9 'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component )', 9 'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component )',
10 }, 10 },
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 }, 315 },
316 ], 316 ],
317 'conditions': [ 317 'conditions': [
318 ['target_arch=="ia32"', { 318 ['target_arch=="ia32"', {
319 'msvs_settings': { 319 'msvs_settings': {
320 'VCCLCompilerTool': { 320 'VCCLCompilerTool': {
321 'EnableEnhancedInstructionSet': '4', # NoExtensions 321 'EnableEnhancedInstructionSet': '4', # NoExtensions
322 }, 322 },
323 }, 323 },
324 }], 324 }],
325 ['win_use_allocator_shim==1', {
326 'dependencies': [
327 '<(allocator_target)',
328 ],
329 }],
330 ], 325 ],
331 }, 326 },
332 { 327 {
333 # GN version: //chrome/installer/setup:setup_unittests 328 # GN version: //chrome/installer/setup:setup_unittests
334 'target_name': 'setup_unittests', 329 'target_name': 'setup_unittests',
335 'type': 'executable', 330 'type': 'executable',
336 'dependencies': [ 331 'dependencies': [
337 'setup_lib', 332 'setup_lib',
338 '../base/base.gyp:base_i18n', 333 '../base/base.gyp:base_i18n',
339 '../base/base.gyp:test_support_base', 334 '../base/base.gyp:test_support_base',
(...skipping 23 matching lines...) Expand all
363 'installer/mini_installer/regkey.h', 358 'installer/mini_installer/regkey.h',
364 'installer/setup/archive_patch_helper_unittest.cc', 359 'installer/setup/archive_patch_helper_unittest.cc',
365 'installer/setup/install_unittest.cc', 360 'installer/setup/install_unittest.cc',
366 'installer/setup/install_worker_unittest.cc', 361 'installer/setup/install_worker_unittest.cc',
367 'installer/setup/memory_unittest.cc', 362 'installer/setup/memory_unittest.cc',
368 'installer/setup/run_all_unittests.cc', 363 'installer/setup/run_all_unittests.cc',
369 'installer/setup/setup_util_unittest.cc', 364 'installer/setup/setup_util_unittest.cc',
370 'installer/setup/setup_util_unittest.h', 365 'installer/setup/setup_util_unittest.h',
371 'installer/setup/update_active_setup_version_work_item_unittest.cc', 366 'installer/setup/update_active_setup_version_work_item_unittest.cc',
372 ], 367 ],
373 'conditions': [
374 ['win_use_allocator_shim==1', {
375 'dependencies': [
376 '<(allocator_target)',
377 ],
378 }],
379 ],
380 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 368 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
381 'msvs_disabled_warnings': [ 4267, ], 369 'msvs_disabled_warnings': [ 4267, ],
382 }, 370 },
383 ], 371 ],
384 }], 372 }],
385 ['OS=="win" and target_arch=="ia32"', { 373 ['OS=="win" and target_arch=="ia32"', {
386 'targets': [ 374 'targets': [
387 { 375 {
388 'target_name': 'launcher_support64', 376 'target_name': 'launcher_support64',
389 'type': 'static_library', 377 'type': 'static_library',
(...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 '../build/isolate.gypi', 1120 '../build/isolate.gypi',
1133 ], 1121 ],
1134 'sources': [ 1122 'sources': [
1135 'setup_unittests.isolate', 1123 'setup_unittests.isolate',
1136 ], 1124 ],
1137 }, 1125 },
1138 ], 1126 ],
1139 }], 1127 }],
1140 ], 1128 ],
1141 } 1129 }
OLDNEW
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698