| 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 # These files lists are shared with the GN build. | 9 # These files lists are shared with the GN build. |
| 10 'ash_sources': [ | 10 'ash_sources': [ |
| (...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 947 }], | 947 }], |
| 948 ['use_x11!=1', { | 948 ['use_x11!=1', { |
| 949 'sources!': [ | 949 'sources!': [ |
| 950 # Note: sources list duplicated in GN build. | 950 # Note: sources list duplicated in GN build. |
| 951 'accelerators/key_hold_detector.cc', | 951 'accelerators/key_hold_detector.cc', |
| 952 'accelerators/key_hold_detector.h', | 952 'accelerators/key_hold_detector.h', |
| 953 'accelerators/magnifier_key_scroller.cc', | 953 'accelerators/magnifier_key_scroller.cc', |
| 954 'accelerators/magnifier_key_scroller.h', | 954 'accelerators/magnifier_key_scroller.h', |
| 955 'accelerators/spoken_feedback_toggler.cc', | 955 'accelerators/spoken_feedback_toggler.cc', |
| 956 'accelerators/spoken_feedback_toggler.h', | 956 'accelerators/spoken_feedback_toggler.h', |
| 957 'touch/touch_transformer_controller.cc', | |
| 958 'touch/touch_transformer_controller.h', | |
| 959 ], | 957 ], |
| 960 }, { # else: use_x11==1 | 958 }, { # else: use_x11==1 |
| 961 'dependencies': [ | 959 'dependencies': [ |
| 962 '../build/linux/system.gyp:xfixes', | 960 '../build/linux/system.gyp:xfixes', |
| 963 ], | 961 ], |
| 964 }], | 962 }], |
| 965 ['chromeos==1', { | 963 ['chromeos==1', { |
| 966 'dependencies': [ | 964 'dependencies': [ |
| 967 '../chromeos/chromeos.gyp:chromeos', | 965 '../chromeos/chromeos.gyp:chromeos', |
| 968 # Ash #includes power_supply_properties.pb.h directly. | 966 # Ash #includes power_supply_properties.pb.h directly. |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1138 }], | 1136 }], |
| 1139 ['OS=="win" and win_use_allocator_shim==1', { | 1137 ['OS=="win" and win_use_allocator_shim==1', { |
| 1140 'dependencies': [ | 1138 'dependencies': [ |
| 1141 '../base/allocator/allocator.gyp:allocator', | 1139 '../base/allocator/allocator.gyp:allocator', |
| 1142 ], | 1140 ], |
| 1143 }], | 1141 }], |
| 1144 ['use_x11!=1', { | 1142 ['use_x11!=1', { |
| 1145 'sources!': [ | 1143 'sources!': [ |
| 1146 'accelerators/magnifier_key_scroller_unittest.cc', | 1144 'accelerators/magnifier_key_scroller_unittest.cc', |
| 1147 'accelerators/spoken_feedback_toggler_unittest.cc', | 1145 'accelerators/spoken_feedback_toggler_unittest.cc', |
| 1148 'touch/touch_transformer_controller_unittest.cc', | |
| 1149 ], | 1146 ], |
| 1150 }], | 1147 }], |
| 1151 ['chromeos==1', { | 1148 ['chromeos==1', { |
| 1152 'dependencies': [ | 1149 'dependencies': [ |
| 1153 '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', | 1150 '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', |
| 1154 '../chromeos/chromeos.gyp:power_manager_proto', | 1151 '../chromeos/chromeos.gyp:power_manager_proto', |
| 1155 '../device/bluetooth/bluetooth.gyp:device_bluetooth', | 1152 '../device/bluetooth/bluetooth.gyp:device_bluetooth', |
| 1156 '../ui/display/display.gyp:display', | 1153 '../ui/display/display.gyp:display', |
| 1157 '../ui/display/display.gyp:display_test_util', | 1154 '../ui/display/display.gyp:display_test_util', |
| 1158 '../ui/display/display.gyp:display_types', | 1155 '../ui/display/display.gyp:display_types', |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1296 '../build/isolate.gypi', | 1293 '../build/isolate.gypi', |
| 1297 ], | 1294 ], |
| 1298 'sources': [ | 1295 'sources': [ |
| 1299 'ash_unittests.isolate', | 1296 'ash_unittests.isolate', |
| 1300 ], | 1297 ], |
| 1301 }, | 1298 }, |
| 1302 ], | 1299 ], |
| 1303 }], | 1300 }], |
| 1304 ], | 1301 ], |
| 1305 } | 1302 } |
| OLD | NEW |