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

Side by Side Diff: ash/ash.gyp

Issue 11896029: Remove use_ibus variable from gyp file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | build/common.gypi » ('j') | 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 { 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 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 'wm/workspace/multi_window_resize_controller_unittest.cc', 623 'wm/workspace/multi_window_resize_controller_unittest.cc',
624 'wm/workspace/workspace_event_handler_test_helper.cc', 624 'wm/workspace/workspace_event_handler_test_helper.cc',
625 'wm/workspace/workspace_event_handler_test_helper.h', 625 'wm/workspace/workspace_event_handler_test_helper.h',
626 'wm/workspace/workspace_event_handler_unittest.cc', 626 'wm/workspace/workspace_event_handler_unittest.cc',
627 'wm/workspace/workspace_layout_manager_unittest.cc', 627 'wm/workspace/workspace_layout_manager_unittest.cc',
628 'wm/workspace/workspace_manager_unittest.cc', 628 'wm/workspace/workspace_manager_unittest.cc',
629 'wm/workspace/workspace_window_resizer_unittest.cc', 629 'wm/workspace/workspace_window_resizer_unittest.cc',
630 '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.rc ', 630 '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.rc ',
631 ], 631 ],
632 'conditions': [ 632 'conditions': [
633 ['use_ibus==1', {
634 'dependencies': [
635 '../build/linux/system.gyp:ibus',
636 ],
637 }],
638 ['OS=="win"', { 633 ['OS=="win"', {
639 'sources/': [ 634 'sources/': [
640 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906 635 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906
641 ['exclude', 'focus_cycler_unittest.cc'], 636 ['exclude', 'focus_cycler_unittest.cc'],
642 # All tests for multiple displays: not supported on Windows Ash. 637 # All tests for multiple displays: not supported on Windows Ash.
643 ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc'] , 638 ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc'] ,
644 ['exclude', 'display/display_controller_unittest.cc'], 639 ['exclude', 'display/display_controller_unittest.cc'],
645 ['exclude', 'display/display_manager_unittest.cc'], 640 ['exclude', 'display/display_manager_unittest.cc'],
646 ['exclude', 'display/mouse_cursor_event_filter_unittest.cc'], 641 ['exclude', 'display/mouse_cursor_event_filter_unittest.cc'],
647 ['exclude', 'extended_desktop_unittest.cc'], 642 ['exclude', 'extended_desktop_unittest.cc'],
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 'shell/cocoa/app-Info.plist', 752 'shell/cocoa/app-Info.plist',
758 ], 753 ],
759 'xcode_settings': { 754 'xcode_settings': {
760 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 755 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
761 }, 756 },
762 }], 757 }],
763 ], 758 ],
764 }, 759 },
765 ], 760 ],
766 } 761 }
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698