| 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 }, | 9 }, |
| 10 'includes': [ | 10 'includes': [ |
| (...skipping 690 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 701 'msvs_disabled_warnings': [ 4267, ], | 701 'msvs_disabled_warnings': [ 4267, ], |
| 702 }], | 702 }], |
| 703 ['use_x11!=1', { | 703 ['use_x11!=1', { |
| 704 'sources/': [ | 704 'sources/': [ |
| 705 ['exclude', 'accelerators/key_hold_detector.cc'], | 705 ['exclude', 'accelerators/key_hold_detector.cc'], |
| 706 ['exclude', 'accelerators/key_hold_detector.h'], | 706 ['exclude', 'accelerators/key_hold_detector.h'], |
| 707 ['exclude', 'accelerators/magnifier_key_scroller.cc'], | 707 ['exclude', 'accelerators/magnifier_key_scroller.cc'], |
| 708 ['exclude', 'accelerators/magnifier_key_scroller.h'], | 708 ['exclude', 'accelerators/magnifier_key_scroller.h'], |
| 709 ['exclude', 'accelerators/spoken_feedback_toggler.cc'], | 709 ['exclude', 'accelerators/spoken_feedback_toggler.cc'], |
| 710 ['exclude', 'accelerators/spoken_feedback_toggler.h'], | 710 ['exclude', 'accelerators/spoken_feedback_toggler.h'], |
| 711 ['exclude', 'touch/touch_transformer_controller.cc'], | |
| 712 ['exclude', 'touch/touch_transformer_controller.h'], | |
| 713 ], | 711 ], |
| 714 }, { # else: use_x11==1 | 712 }, { # else: use_x11==1 |
| 715 'dependencies': [ | 713 'dependencies': [ |
| 716 '../build/linux/system.gyp:xfixes', | 714 '../build/linux/system.gyp:xfixes', |
| 717 ], | 715 ], |
| 718 }], | 716 }], |
| 719 ['chromeos==1', { | 717 ['chromeos==1', { |
| 720 'dependencies': [ | 718 'dependencies': [ |
| 721 '../chromeos/chromeos.gyp:chromeos', | 719 '../chromeos/chromeos.gyp:chromeos', |
| 722 # Ash #includes power_supply_properties.pb.h directly. | 720 # Ash #includes power_supply_properties.pb.h directly. |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1058 }], | 1056 }], |
| 1059 ['OS=="win" and win_use_allocator_shim==1', { | 1057 ['OS=="win" and win_use_allocator_shim==1', { |
| 1060 'dependencies': [ | 1058 'dependencies': [ |
| 1061 '../base/allocator/allocator.gyp:allocator', | 1059 '../base/allocator/allocator.gyp:allocator', |
| 1062 ], | 1060 ], |
| 1063 }], | 1061 }], |
| 1064 ['use_x11!=1', { | 1062 ['use_x11!=1', { |
| 1065 'sources/': [ | 1063 'sources/': [ |
| 1066 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'], | 1064 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'], |
| 1067 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'], | 1065 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'], |
| 1068 ['exclude', 'touch/touch_transformer_controller_unittest.cc'], | |
| 1069 ], | 1066 ], |
| 1070 }], | 1067 }], |
| 1071 ['chromeos==1', { | 1068 ['chromeos==1', { |
| 1072 'dependencies': [ | 1069 'dependencies': [ |
| 1073 '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', | 1070 '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', |
| 1074 '../chromeos/chromeos.gyp:power_manager_proto', | 1071 '../chromeos/chromeos.gyp:power_manager_proto', |
| 1075 '../device/bluetooth/bluetooth.gyp:device_bluetooth', | 1072 '../device/bluetooth/bluetooth.gyp:device_bluetooth', |
| 1076 '../ui/display/display.gyp:display', | 1073 '../ui/display/display.gyp:display', |
| 1077 '../ui/display/display.gyp:display_test_util', | 1074 '../ui/display/display.gyp:display_test_util', |
| 1078 '../ui/display/display.gyp:display_types', | 1075 '../ui/display/display.gyp:display_types', |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1214 'conditions': [ | 1211 'conditions': [ |
| 1215 ['chromeos==1', { | 1212 ['chromeos==1', { |
| 1216 'dependencies': [ | 1213 'dependencies': [ |
| 1217 '../ui/display/display.gyp:display', | 1214 '../ui/display/display.gyp:display', |
| 1218 ], | 1215 ], |
| 1219 }], | 1216 }], |
| 1220 ], | 1217 ], |
| 1221 }, | 1218 }, |
| 1222 ], | 1219 ], |
| 1223 } | 1220 } |
| OLD | NEW |