| 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 875 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 886 '../third_party/wtl/include', | 886 '../third_party/wtl/include', |
| 887 ], | 887 ], |
| 888 'msvs_settings': { | 888 'msvs_settings': { |
| 889 'VCManifestTool': { | 889 'VCManifestTool': { |
| 890 'AdditionalManifestFiles': [ | 890 'AdditionalManifestFiles': [ |
| 891 '$(ProjectDir)\\test\\views_unittest.manifest', | 891 '$(ProjectDir)\\test\\views_unittest.manifest', |
| 892 ], | 892 ], |
| 893 }, | 893 }, |
| 894 }, | 894 }, |
| 895 }], | 895 }], |
| 896 ['OS=="win" and win_use_allocator_shim==1', { | |
| 897 'dependencies': [ | |
| 898 '../../base/allocator/allocator.gyp:allocator', | |
| 899 ], | |
| 900 }], | |
| 901 ['OS=="linux" and use_allocator!="none"', { | |
| 902 # See http://crbug.com/162998#c4 for why this is needed. | |
| 903 'dependencies': [ | |
| 904 '../../base/allocator/allocator.gyp:allocator', | |
| 905 ], | |
| 906 }], | |
| 907 ['use_x11==1', { | 896 ['use_x11==1', { |
| 908 'dependencies': [ | 897 'dependencies': [ |
| 909 '../../build/linux/system.gyp:x11', | 898 '../../build/linux/system.gyp:x11', |
| 910 '../../build/linux/system.gyp:xext', | 899 '../../build/linux/system.gyp:xext', |
| 911 '../events/devices/events_devices.gyp:events_devices', | 900 '../events/devices/events_devices.gyp:events_devices', |
| 912 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform'
, | 901 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform'
, |
| 913 ], | 902 ], |
| 914 }], | 903 }], |
| 915 ['use_aura==1', { | 904 ['use_aura==1', { |
| 916 'sources': [ '<@(views_unittests_aura_sources)' ], | 905 'sources': [ '<@(views_unittests_aura_sources)' ], |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 982 '../aura/aura.gyp:aura', | 971 '../aura/aura.gyp:aura', |
| 983 '../wm/wm.gyp:wm', | 972 '../wm/wm.gyp:wm', |
| 984 ], | 973 ], |
| 985 }], | 974 }], |
| 986 ], | 975 ], |
| 987 }, # target_name: macviews_interactive_ui_tests | 976 }, # target_name: macviews_interactive_ui_tests |
| 988 ], # targets | 977 ], # targets |
| 989 }], | 978 }], |
| 990 ], # conditions | 979 ], # conditions |
| 991 } | 980 } |
| OLD | NEW |