| 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 9 # These files lists are shared with the GN build. | 9 # These files lists are shared with the GN build. |
| 10 'ash_sources': [ | 10 'ash_sources': [ |
| (...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 890 '../ui/accelerometer/ui_accelerometer.gyp:ui_accelerometer', | 890 '../ui/accelerometer/ui_accelerometer.gyp:ui_accelerometer', |
| 891 '../ui/accessibility/accessibility.gyp:accessibility', | 891 '../ui/accessibility/accessibility.gyp:accessibility', |
| 892 '../ui/app_list/app_list.gyp:app_list', | 892 '../ui/app_list/app_list.gyp:app_list', |
| 893 '../ui/aura/aura.gyp:aura', | 893 '../ui/aura/aura.gyp:aura', |
| 894 '../ui/base/ui_base.gyp:ui_base', | 894 '../ui/base/ui_base.gyp:ui_base', |
| 895 '../ui/compositor/compositor.gyp:compositor', | 895 '../ui/compositor/compositor.gyp:compositor', |
| 896 '../ui/events/devices/events_devices.gyp:events_devices', | 896 '../ui/events/devices/events_devices.gyp:events_devices', |
| 897 '../ui/events/events.gyp:events', | 897 '../ui/events/events.gyp:events', |
| 898 '../ui/events/events.gyp:events_base', | 898 '../ui/events/events.gyp:events_base', |
| 899 '../ui/events/events.gyp:gesture_detection', | 899 '../ui/events/events.gyp:gesture_detection', |
| 900 '../ui/events/platform/events_platform.gyp:events_platform', | |
| 901 '../ui/gfx/gfx.gyp:gfx', | 900 '../ui/gfx/gfx.gyp:gfx', |
| 902 '../ui/gfx/gfx.gyp:gfx_geometry', | 901 '../ui/gfx/gfx.gyp:gfx_geometry', |
| 903 '../ui/keyboard/keyboard.gyp:keyboard', | 902 '../ui/keyboard/keyboard.gyp:keyboard', |
| 904 '../ui/message_center/message_center.gyp:message_center', | 903 '../ui/message_center/message_center.gyp:message_center', |
| 905 '../ui/resources/ui_resources.gyp:ui_resources', | 904 '../ui/resources/ui_resources.gyp:ui_resources', |
| 906 '../ui/strings/ui_strings.gyp:ui_strings', | 905 '../ui/strings/ui_strings.gyp:ui_strings', |
| 907 '../ui/views/controls/webview/webview.gyp:webview', | 906 '../ui/views/controls/webview/webview.gyp:webview', |
| 908 '../ui/views/views.gyp:views', | 907 '../ui/views/views.gyp:views', |
| 909 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', | 908 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', |
| 910 '../ui/wm/wm.gyp:wm', | 909 '../ui/wm/wm.gyp:wm', |
| (...skipping 12 matching lines...) Expand all Loading... |
| 923 'sources!': [ | 922 'sources!': [ |
| 924 # Note: sources list duplicated in GN build. | 923 # Note: sources list duplicated in GN build. |
| 925 "sticky_keys/sticky_keys_controller.cc", | 924 "sticky_keys/sticky_keys_controller.cc", |
| 926 "sticky_keys/sticky_keys_controller.h", | 925 "sticky_keys/sticky_keys_controller.h", |
| 927 ], | 926 ], |
| 928 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 927 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 929 'msvs_disabled_warnings': [ 4267, ], | 928 'msvs_disabled_warnings': [ 4267, ], |
| 930 }], | 929 }], |
| 931 ['use_x11==1', { | 930 ['use_x11==1', { |
| 932 'dependencies': [ | 931 'dependencies': [ |
| 933 '../build/linux/system.gyp:x11', | |
| 934 '../build/linux/system.gyp:xfixes', | 932 '../build/linux/system.gyp:xfixes', |
| 935 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', | |
| 936 ], | 933 ], |
| 937 }], | 934 }], |
| 938 ['use_ozone==1', { | 935 ['use_ozone==1', { |
| 939 'dependencies': [ | 936 'dependencies': [ |
| 940 '../ui/ozone/ozone.gyp:ozone', | 937 '../ui/ozone/ozone.gyp:ozone', |
| 941 ], | 938 ], |
| 942 }], | 939 }], |
| 943 ['chromeos==1', { | 940 ['chromeos==1', { |
| 944 'dependencies': [ | 941 'dependencies': [ |
| 945 '../chromeos/chromeos.gyp:chromeos', | 942 '../chromeos/chromeos.gyp:chromeos', |
| (...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1289 '../build/isolate.gypi', | 1286 '../build/isolate.gypi', |
| 1290 ], | 1287 ], |
| 1291 'sources': [ | 1288 'sources': [ |
| 1292 'ash_unittests.isolate', | 1289 'ash_unittests.isolate', |
| 1293 ], | 1290 ], |
| 1294 }, | 1291 }, |
| 1295 ], | 1292 ], |
| 1296 }], | 1293 }], |
| 1297 ], | 1294 ], |
| 1298 } | 1295 } |
| OLD | NEW |