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

Side by Side Diff: components/components_tests.gyp

Issue 695913003: Add more allocator.gyp:allocator dependencies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix two more; now i can build 'all' in 32-bit Created 6 years, 1 month 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_tests.gypi ('k') | content/content_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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # This turns on e.g. the filename-based detection of which 7 # This turns on e.g. the filename-based detection of which
8 # platforms to include source files on (e.g. files ending in 8 # platforms to include source files on (e.g. files ending in
9 # _mac.h or _mac.cc are only compiled on MacOSX). 9 # _mac.h or _mac.cc are only compiled on MacOSX).
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 ['toolkit_views == 1', { 469 ['toolkit_views == 1', {
470 'sources': [ 470 'sources': [
471 'bookmarks/browser/bookmark_node_data_unittest.cc', 471 'bookmarks/browser/bookmark_node_data_unittest.cc',
472 'constrained_window/constrained_window_views_unittest.cc', 472 'constrained_window/constrained_window_views_unittest.cc',
473 ], 473 ],
474 'dependencies': [ 474 'dependencies': [
475 '<(DEPTH)/ui/views/views.gyp:views_test_support', 475 '<(DEPTH)/ui/views/views.gyp:views_test_support',
476 'components.gyp:constrained_window', 476 'components.gyp:constrained_window',
477 ] 477 ]
478 }], 478 }],
479 ['OS=="win" and component!="shared_library" and win_use_allocator_sh im==1', {
480 'dependencies': [
481 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
482 ],
483 }],
479 ['OS != "ios"', { 484 ['OS != "ios"', {
480 'sources': [ 485 'sources': [
481 'autofill/content/renderer/renderer_save_password_progress_logge r_unittest.cc', 486 'autofill/content/renderer/renderer_save_password_progress_logge r_unittest.cc',
482 'dom_distiller/content/dom_distiller_viewer_source_unittest.cc', 487 'dom_distiller/content/dom_distiller_viewer_source_unittest.cc',
483 'dom_distiller/content/web_contents_main_frame_observer_unittest .cc', 488 'dom_distiller/content/web_contents_main_frame_observer_unittest .cc',
484 'error_page/renderer/net_error_helper_core_unittest.cc', 489 'error_page/renderer/net_error_helper_core_unittest.cc',
485 'metrics/gpu/gpu_metrics_provider_unittest.cc', 490 'metrics/gpu/gpu_metrics_provider_unittest.cc',
486 'password_manager/content/browser/content_credential_manager_dis patcher_unittest.cc', 491 'password_manager/content/browser/content_credential_manager_dis patcher_unittest.cc',
487 'power/origin_power_map_unittest.cc', 492 'power/origin_power_map_unittest.cc',
488 ], 493 ],
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 ], 879 ],
875 'sources': [ 880 'sources': [
876 'visitedlink/test/visitedlink_perftest.cc', 881 'visitedlink/test/visitedlink_perftest.cc',
877 ], 882 ],
878 'conditions': [ 883 'conditions': [
879 ['OS == "android"', { 884 ['OS == "android"', {
880 'dependencies': [ 885 'dependencies': [
881 '../testing/android/native_test.gyp:native_test_native_code', 886 '../testing/android/native_test.gyp:native_test_native_code',
882 ], 887 ],
883 }], 888 }],
889 ['OS=="win" and component!="shared_library" and win_use_allocator_shi m==1', {
890 'dependencies': [
891 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
892 ],
893 }],
884 ], 894 ],
885 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 895 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
886 'msvs_disabled_warnings': [ 4267, ], 896 'msvs_disabled_warnings': [ 4267, ],
887 }, 897 },
888 ], 898 ],
889 'conditions': [ 899 'conditions': [
890 ['OS == "android"', { 900 ['OS == "android"', {
891 'targets': [ 901 'targets': [
892 { 902 {
893 'target_name': 'components_unittests_apk', 903 'target_name': 'components_unittests_apk',
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1011 'dependencies': [ 1021 'dependencies': [
1012 '../base/allocator/allocator.gyp:allocator', 1022 '../base/allocator/allocator.gyp:allocator',
1013 ], 1023 ],
1014 }], 1024 }],
1015 ], 1025 ],
1016 }, 1026 },
1017 ], 1027 ],
1018 }], 1028 }],
1019 ], 1029 ],
1020 } 1030 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698