| 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 661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 672 'dependencies': [ | 672 'dependencies': [ |
| 673 '../ozone/ozone.gyp:ozone', | 673 '../ozone/ozone.gyp:ozone', |
| 674 ], | 674 ], |
| 675 }], | 675 }], |
| 676 ['use_x11==1', { | 676 ['use_x11==1', { |
| 677 'dependencies': [ | 677 'dependencies': [ |
| 678 '../../build/linux/system.gyp:x11', | 678 '../../build/linux/system.gyp:x11', |
| 679 '../../build/linux/system.gyp:xrandr', | 679 '../../build/linux/system.gyp:xrandr', |
| 680 '../events/devices/events_devices.gyp:events_devices', | 680 '../events/devices/events_devices.gyp:events_devices', |
| 681 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform'
, | 681 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform'
, |
| 682 '../gfx/x/gfx_x11.gyp:gfx_x11', | |
| 683 ], | 682 ], |
| 684 }], | 683 }], |
| 685 ['use_aura==1', { | 684 ['use_aura==1', { |
| 686 'sources': [ | 685 'sources': [ |
| 687 '<@(views_aura_sources)', | 686 '<@(views_aura_sources)', |
| 688 ], | 687 ], |
| 689 'dependencies': [ | 688 'dependencies': [ |
| 690 '../aura/aura.gyp:aura', | 689 '../aura/aura.gyp:aura', |
| 691 '../wm/wm.gyp:wm', | 690 '../wm/wm.gyp:wm', |
| 692 ], | 691 ], |
| 693 }], | 692 }], |
| 694 ['use_aura and chromeos == 0', { | 693 ['use_aura and chromeos == 0', { |
| 695 'sources': [ '<@(views_desktop_aura_sources)' ], | 694 'sources': [ '<@(views_desktop_aura_sources)' ], |
| 696 'conditions': [ | 695 'conditions': [ |
| 697 ['OS == "linux"', { | 696 ['OS == "linux"', { |
| 698 'sources': [ '<@(views_desktop_aura_linux_sources)' ], | 697 'sources': [ '<@(views_desktop_aura_linux_sources)' ], |
| 699 }], | 698 }], |
| 700 ['use_x11 == 1', { | 699 ['use_x11 == 1', { |
| 701 'sources': [ '<@(views_desktop_aura_x11_sources)' ], | 700 'sources': [ '<@(views_desktop_aura_x11_sources)' ], |
| 702 'dependencies': [ | |
| 703 '../../build/linux/system.gyp:xext', | |
| 704 ], | |
| 705 }], | 701 }], |
| 706 ['OS == "win"', { | 702 ['OS == "win"', { |
| 707 'sources': [ '<@(views_desktop_aura_win_sources)' ], | 703 'sources': [ '<@(views_desktop_aura_win_sources)' ], |
| 708 }], | 704 }], |
| 709 ['use_ozone==1', { | 705 ['use_ozone==1', { |
| 710 'sources': [ '<@(views_desktop_aura_ozone_sources)' ], | 706 'sources': [ '<@(views_desktop_aura_ozone_sources)' ], |
| 711 }], | 707 }], |
| 712 ], | 708 ], |
| 713 }], | 709 }], |
| 714 ['OS=="mac"', { | 710 ['OS=="mac"', { |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 907 '../aura/aura.gyp:aura', | 903 '../aura/aura.gyp:aura', |
| 908 '../wm/wm.gyp:wm', | 904 '../wm/wm.gyp:wm', |
| 909 ], | 905 ], |
| 910 }], | 906 }], |
| 911 ], | 907 ], |
| 912 }, # target_name: macviews_interactive_ui_tests | 908 }, # target_name: macviews_interactive_ui_tests |
| 913 ], # targets | 909 ], # targets |
| 914 }], | 910 }], |
| 915 ], # conditions | 911 ], # conditions |
| 916 } | 912 } |
| OLD | NEW |