| OLD | NEW |
| 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 'variables': { | 5 'variables': { |
| 6 'chromium_code': 1, | 6 'chromium_code': 1, |
| 7 # Sources lists shared with GN build. | 7 # Sources lists shared with GN build. |
| 8 'views_sources': [ | 8 'views_sources': [ |
| 9 'accessibility/native_view_accessibility.cc', | 9 'accessibility/native_view_accessibility.cc', |
| 10 'accessibility/native_view_accessibility.h', | 10 'accessibility/native_view_accessibility.h', |
| (...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 877 '../third_party/wtl/include', | 877 '../third_party/wtl/include', |
| 878 ], | 878 ], |
| 879 'msvs_settings': { | 879 'msvs_settings': { |
| 880 'VCManifestTool': { | 880 'VCManifestTool': { |
| 881 'AdditionalManifestFiles': [ | 881 'AdditionalManifestFiles': [ |
| 882 '$(ProjectDir)\\test\\views_unittest.manifest', | 882 '$(ProjectDir)\\test\\views_unittest.manifest', |
| 883 ], | 883 ], |
| 884 }, | 884 }, |
| 885 }, | 885 }, |
| 886 }], | 886 }], |
| 887 ['OS=="win" and win_use_allocator_shim==1', { | |
| 888 'dependencies': [ | |
| 889 '../../base/allocator/allocator.gyp:allocator', | |
| 890 ], | |
| 891 }], | |
| 892 ['OS=="linux" and use_allocator!="none"', { | |
| 893 # See http://crbug.com/162998#c4 for why this is needed. | |
| 894 'dependencies': [ | |
| 895 '../../base/allocator/allocator.gyp:allocator', | |
| 896 ], | |
| 897 }], | |
| 898 ['use_x11==1', { | 887 ['use_x11==1', { |
| 899 'dependencies': [ | 888 'dependencies': [ |
| 900 '../../build/linux/system.gyp:x11', | 889 '../../build/linux/system.gyp:x11', |
| 901 '../../build/linux/system.gyp:xext', | 890 '../../build/linux/system.gyp:xext', |
| 902 '../events/devices/events_devices.gyp:events_devices', | 891 '../events/devices/events_devices.gyp:events_devices', |
| 903 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform'
, | 892 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform'
, |
| 904 ], | 893 ], |
| 905 }], | 894 }], |
| 906 ['use_aura==1', { | 895 ['use_aura==1', { |
| 907 'sources': [ '<@(views_unittests_aura_sources)' ], | 896 'sources': [ '<@(views_unittests_aura_sources)' ], |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 973 '../aura/aura.gyp:aura', | 962 '../aura/aura.gyp:aura', |
| 974 '../wm/wm.gyp:wm', | 963 '../wm/wm.gyp:wm', |
| 975 ], | 964 ], |
| 976 }], | 965 }], |
| 977 ], | 966 ], |
| 978 }, # target_name: macviews_interactive_ui_tests | 967 }, # target_name: macviews_interactive_ui_tests |
| 979 ], # targets | 968 ], # targets |
| 980 }], | 969 }], |
| 981 ], # conditions | 970 ], # conditions |
| 982 } | 971 } |
| OLD | NEW |