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

Side by Side Diff: ui/app_list/app_list.gyp

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 | « third_party/WebKit/Source/wtf/wtf_tests.gyp ('k') | ui/aura/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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 ['component=="static_library"', { 310 ['component=="static_library"', {
311 # Needed to link to Obj-C static libraries. 311 # Needed to link to Obj-C static libraries.
312 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 312 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
313 }], 313 }],
314 ], 314 ],
315 }, { # OS!="mac" 315 }, { # OS!="mac"
316 'sources/': [ 316 'sources/': [
317 ['exclude', 'cocoa/'], 317 ['exclude', 'cocoa/'],
318 ], 318 ],
319 }], 319 }],
320 # See http://crbug.com/162998#c4 for why this is needed.
321 ['OS=="linux" and use_allocator!="none"', {
322 'dependencies': [
323 '../../base/allocator/allocator.gyp:allocator',
324 ],
325 }],
326 ['OS=="win" and win_use_allocator_shim==1', {
327 'dependencies': [
328 '../../base/allocator/allocator.gyp:allocator',
329 ],
330 }],
331 ], 320 ],
332 # Disable c4267 warnings until we fix size_t to int truncations. 321 # Disable c4267 warnings until we fix size_t to int truncations.
333 'msvs_disabled_warnings': [ 4267, ], 322 'msvs_disabled_warnings': [ 4267, ],
334 }, 323 },
335 ], 324 ],
336 'conditions': [ 325 'conditions': [
337 ['toolkit_views==1', { 326 ['toolkit_views==1', {
338 'targets': [ 327 'targets': [
339 { 328 {
340 'target_name': 'app_list_demo', 329 'target_name': 'app_list_demo',
(...skipping 22 matching lines...) Expand all
363 'msvs_settings': { 352 'msvs_settings': {
364 'VCLinkerTool': { 353 'VCLinkerTool': {
365 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 354 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
366 }, 355 },
367 }, 356 },
368 'dependencies': [ 357 'dependencies': [
369 '../../sandbox/sandbox.gyp:sandbox', 358 '../../sandbox/sandbox.gyp:sandbox',
370 '../../content/content.gyp:sandbox_helper_win', 359 '../../content/content.gyp:sandbox_helper_win',
371 ], 360 ],
372 }], 361 }],
373 ['OS=="win" and component!="shared_library" and win_use_allocator_sh im==1', {
374 'dependencies': [
375 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
376 ],
377 }],
378 ], 362 ],
379 }, 363 },
380 ], 364 ],
381 }], # toolkit_views==1 365 }], # toolkit_views==1
382 ['test_isolation_mode != "noop"', { 366 ['test_isolation_mode != "noop"', {
383 'targets': [ 367 'targets': [
384 { 368 {
385 'target_name': 'app_list_unittests_run', 369 'target_name': 'app_list_unittests_run',
386 'type': 'none', 370 'type': 'none',
387 'dependencies': [ 371 'dependencies': [
(...skipping 10 matching lines...) Expand all
398 'dependencies': [ 382 'dependencies': [
399 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 383 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
400 ], 384 ],
401 }], 385 }],
402 ], 386 ],
403 }, 387 },
404 ], 388 ],
405 }], 389 }],
406 ], 390 ],
407 } 391 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/wtf/wtf_tests.gyp ('k') | ui/aura/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698