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

Side by Side Diff: ash/ash.gyp

Issue 214693010: Remove USE_X11==1 check when including OutputConfigurator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 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 | Annotate | Revision Log
« no previous file with comments | « apps/shell/browser/shell_desktop_controller.cc ('k') | ash/display/display_controller.cc » ('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 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 'msvs_disabled_warnings': [ 4267, ], 670 'msvs_disabled_warnings': [ 4267, ],
671 }], 671 }],
672 ['use_x11!=1', { 672 ['use_x11!=1', {
673 'sources/': [ 673 'sources/': [
674 ['exclude', 'accelerators/key_hold_detector.cc'], 674 ['exclude', 'accelerators/key_hold_detector.cc'],
675 ['exclude', 'accelerators/key_hold_detector.h'], 675 ['exclude', 'accelerators/key_hold_detector.h'],
676 ['exclude', 'accelerators/magnifier_key_scroller.cc'], 676 ['exclude', 'accelerators/magnifier_key_scroller.cc'],
677 ['exclude', 'accelerators/magnifier_key_scroller.h'], 677 ['exclude', 'accelerators/magnifier_key_scroller.h'],
678 ['exclude', 'accelerators/spoken_feedback_toggler.cc'], 678 ['exclude', 'accelerators/spoken_feedback_toggler.cc'],
679 ['exclude', 'accelerators/spoken_feedback_toggler.h'], 679 ['exclude', 'accelerators/spoken_feedback_toggler.h'],
680 ['exclude', 'display/display_change_observer_chromeos.cc'],
681 ['exclude', 'display/display_change_observer_chromeos.h'],
682 ['exclude', 'display/display_error_observer_chromeos.cc'],
683 ['exclude', 'display/display_error_observer_chromeos.h'],
684 ], 680 ],
685 }], 681 }],
686 ['chromeos==1', { 682 ['chromeos==1', {
687 'dependencies': [ 683 'dependencies': [
688 '../chromeos/chromeos.gyp:chromeos', 684 '../chromeos/chromeos.gyp:chromeos',
689 # Ash #includes power_supply_properties.pb.h directly. 685 # Ash #includes power_supply_properties.pb.h directly.
690 '../chromeos/chromeos.gyp:power_manager_proto', 686 '../chromeos/chromeos.gyp:power_manager_proto',
691 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 687 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
692 '../ui/display/display.gyp:display', 688 '../ui/display/display.gyp:display',
693 ], 689 ],
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
1024 }], 1020 }],
1025 ['OS=="win" and win_use_allocator_shim==1', { 1021 ['OS=="win" and win_use_allocator_shim==1', {
1026 'dependencies': [ 1022 'dependencies': [
1027 '../base/allocator/allocator.gyp:allocator', 1023 '../base/allocator/allocator.gyp:allocator',
1028 ], 1024 ],
1029 }], 1025 }],
1030 ['use_x11!=1', { 1026 ['use_x11!=1', {
1031 'sources/': [ 1027 'sources/': [
1032 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'], 1028 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'],
1033 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'], 1029 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'],
1034 ['exclude', 'display/display_change_observer_chromeos_unittest.cc'],
1035 ['exclude', 'display/display_error_observer_chromeos_unittest.cc'],
1036 ], 1030 ],
1037 }], 1031 }],
1038 ['chromeos==1', { 1032 ['chromeos==1', {
1039 'dependencies': [ 1033 'dependencies': [
1040 '../chromeos/chromeos.gyp:power_manager_proto', 1034 '../chromeos/chromeos.gyp:power_manager_proto',
1041 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1035 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1042 '../ui/display/display.gyp:display', 1036 '../ui/display/display.gyp:display',
1043 '../ui/display/display.gyp:display_test_util', 1037 '../ui/display/display.gyp:display_test_util',
1044 ], 1038 ],
1045 'sources': [ 1039 'sources': [
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
1143 }], 1137 }],
1144 ['chromeos==1', { 1138 ['chromeos==1', {
1145 'dependencies': [ 1139 'dependencies': [
1146 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1140 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1147 ], 1141 ],
1148 }], 1142 }],
1149 ], 1143 ],
1150 }, 1144 },
1151 ], 1145 ],
1152 } 1146 }
OLDNEW
« no previous file with comments | « apps/shell/browser/shell_desktop_controller.cc ('k') | ash/display/display_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698