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

Side by Side Diff: ui/views/views.gyp

Issue 1014663002: Buildfix for Ozone Linux build: guard build/linux/system.gyp:atk dep. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 'sources!': [ 628 'sources!': [
629 'bubble/tray_bubble_view.cc', 629 'bubble/tray_bubble_view.cc',
630 'bubble/tray_bubble_view.h', 630 'bubble/tray_bubble_view.h',
631 ], 631 ],
632 }], 632 }],
633 ['chromeos==0 and use_x11==1', { 633 ['chromeos==0 and use_x11==1', {
634 'dependencies': [ 634 'dependencies': [
635 '../display/display.gyp:display_util', 635 '../display/display.gyp:display_util',
636 ], 636 ],
637 }], 637 }],
638 ['OS=="linux" and chromeos==0', { 638 ['OS=="linux" and chromeos==0 and use_ozone==0', {
dmazzoni 2015/03/16 21:36:00 My change only added the dependency on system.gyp:
gunsch 2015/03/16 21:39:03 I wasn't sure either, figured I'd mail and hope fo
639 'dependencies': [ 639 'dependencies': [
640 '../../build/linux/system.gyp:atk', 640 '../../build/linux/system.gyp:atk',
641 '../shell_dialogs/shell_dialogs.gyp:shell_dialogs', 641 '../shell_dialogs/shell_dialogs.gyp:shell_dialogs',
642 ], 642 ],
643 'sources!': [ 643 'sources!': [
644 'window/window_button_order_provider.cc', 644 'window/window_button_order_provider.cc',
645 ], 645 ],
646 }, { # OS=="linux" and chromeos==0 646 }, { # OS=="linux" and chromeos==0
647 'sources/': [ 647 'sources/': [
648 ['exclude', 'linux_ui'], 648 ['exclude', 'linux_ui'],
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
914 '../aura/aura.gyp:aura', 914 '../aura/aura.gyp:aura',
915 '../wm/wm.gyp:wm', 915 '../wm/wm.gyp:wm',
916 ], 916 ],
917 }], 917 }],
918 ], 918 ],
919 }, # target_name: macviews_interactive_ui_tests 919 }, # target_name: macviews_interactive_ui_tests
920 ], # targets 920 ], # targets
921 }], 921 }],
922 ], # conditions 922 ], # conditions
923 } 923 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698