| 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 # These files lists are shared with the GN build. | 8 # These files lists are shared with the GN build. |
| 9 'ash_sources': [ | 9 'ash_sources': [ |
| 10 'accelerators/accelerator_commands.cc', | 10 'accelerators/accelerator_commands.cc', |
| (...skipping 1195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1206 'virtual_keyboard_controller_unittest.cc', | 1206 'virtual_keyboard_controller_unittest.cc', |
| 1207 'wm/maximize_mode/maximize_mode_controller_unittest.cc', | 1207 'wm/maximize_mode/maximize_mode_controller_unittest.cc', |
| 1208 'wm/workspace/workspace_window_resizer_unittest.cc', | 1208 'wm/workspace/workspace_window_resizer_unittest.cc', |
| 1209 ], | 1209 ], |
| 1210 'sources': [ | 1210 'sources': [ |
| 1211 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', | 1211 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', |
| 1212 ], | 1212 ], |
| 1213 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 1213 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 1214 'msvs_disabled_warnings': [ 4267, ], | 1214 'msvs_disabled_warnings': [ 4267, ], |
| 1215 }], | 1215 }], |
| 1216 ['OS=="win" and win_use_allocator_shim==1', { | |
| 1217 'dependencies': [ | |
| 1218 '../base/allocator/allocator.gyp:allocator', | |
| 1219 ], | |
| 1220 }], | |
| 1221 ['chromeos==1', { | 1216 ['chromeos==1', { |
| 1222 'dependencies': [ | 1217 'dependencies': [ |
| 1223 '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', | 1218 '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', |
| 1224 '../chromeos/chromeos.gyp:power_manager_proto', | 1219 '../chromeos/chromeos.gyp:power_manager_proto', |
| 1225 '../device/bluetooth/bluetooth.gyp:device_bluetooth', | 1220 '../device/bluetooth/bluetooth.gyp:device_bluetooth', |
| 1226 '../ui/display/display.gyp:display', | 1221 '../ui/display/display.gyp:display', |
| 1227 '../ui/display/display.gyp:display_test_support', | 1222 '../ui/display/display.gyp:display_test_support', |
| 1228 '../ui/display/display.gyp:display_test_util', | 1223 '../ui/display/display.gyp:display_test_util', |
| 1229 '../ui/display/display.gyp:display_types', | 1224 '../ui/display/display.gyp:display_types', |
| 1230 ], | 1225 ], |
| 1231 'sources': [ | 1226 'sources': [ |
| 1232 'first_run/first_run_helper_unittest.cc', | 1227 'first_run/first_run_helper_unittest.cc', |
| 1233 ], | 1228 ], |
| 1234 }, { # else: chromeos!=1 | 1229 }, { # else: chromeos!=1 |
| 1235 'sources!': [ | 1230 'sources!': [ |
| 1236 'accelerators/magnifier_key_scroller_unittest.cc', | 1231 'accelerators/magnifier_key_scroller_unittest.cc', |
| 1237 'accelerators/spoken_feedback_toggler_unittest.cc', | 1232 'accelerators/spoken_feedback_toggler_unittest.cc', |
| 1238 'display/resolution_notification_controller_unittest.cc', | 1233 'display/resolution_notification_controller_unittest.cc', |
| 1239 'touch/touch_transformer_controller_unittest.cc', | 1234 'touch/touch_transformer_controller_unittest.cc', |
| 1240 'touch/touchscreen_util_unittest.cc', | 1235 'touch/touchscreen_util_unittest.cc', |
| 1241 ], | 1236 ], |
| 1242 }], | 1237 }], |
| 1243 ['OS=="linux" and component=="shared_library" and use_allocator!="none"'
, { | |
| 1244 'dependencies': [ | |
| 1245 '<(DEPTH)/base/allocator/allocator.gyp:allocator', | |
| 1246 ], | |
| 1247 'link_settings': { | |
| 1248 'ldflags': ['-rdynamic'], | |
| 1249 }, | |
| 1250 }], | |
| 1251 ], | 1238 ], |
| 1252 }, | 1239 }, |
| 1253 { | 1240 { |
| 1254 # GN version: //ash:ash_shell_lib | 1241 # GN version: //ash:ash_shell_lib |
| 1255 'target_name': 'ash_shell_lib', | 1242 'target_name': 'ash_shell_lib', |
| 1256 'type': 'static_library', | 1243 'type': 'static_library', |
| 1257 'dependencies': [ | 1244 'dependencies': [ |
| 1258 '../base/base.gyp:base', | 1245 '../base/base.gyp:base', |
| 1259 '../base/base.gyp:base_i18n', | 1246 '../base/base.gyp:base_i18n', |
| 1260 '../chrome/chrome_resources.gyp:packed_resources', | 1247 '../chrome/chrome_resources.gyp:packed_resources', |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1328 }, | 1315 }, |
| 1329 'dependencies': [ | 1316 'dependencies': [ |
| 1330 '../sandbox/sandbox.gyp:sandbox', | 1317 '../sandbox/sandbox.gyp:sandbox', |
| 1331 ], | 1318 ], |
| 1332 }], | 1319 }], |
| 1333 ['chromeos==1', { | 1320 ['chromeos==1', { |
| 1334 'dependencies': [ | 1321 'dependencies': [ |
| 1335 '../device/bluetooth/bluetooth.gyp:device_bluetooth', | 1322 '../device/bluetooth/bluetooth.gyp:device_bluetooth', |
| 1336 ], | 1323 ], |
| 1337 }], | 1324 }], |
| 1338 ['OS=="win" and component!="shared_library" and win_use_allocator_shim==
1', { | |
| 1339 'dependencies': [ | |
| 1340 '<(DEPTH)/base/allocator/allocator.gyp:allocator', | |
| 1341 ], | |
| 1342 }], | |
| 1343 ], | 1325 ], |
| 1344 }, | 1326 }, |
| 1345 ], | 1327 ], |
| 1346 'conditions': [ | 1328 'conditions': [ |
| 1347 ['test_isolation_mode != "noop"', { | 1329 ['test_isolation_mode != "noop"', { |
| 1348 'targets': [ | 1330 'targets': [ |
| 1349 { | 1331 { |
| 1350 'target_name': 'ash_unittests_run', | 1332 'target_name': 'ash_unittests_run', |
| 1351 'type': 'none', | 1333 'type': 'none', |
| 1352 'dependencies': [ | 1334 'dependencies': [ |
| (...skipping 12 matching lines...) Expand all Loading... |
| 1365 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 1347 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 1366 ], | 1348 ], |
| 1367 } | 1349 } |
| 1368 ], | 1350 ], |
| 1369 ], | 1351 ], |
| 1370 }, | 1352 }, |
| 1371 ], | 1353 ], |
| 1372 }], | 1354 }], |
| 1373 ], | 1355 ], |
| 1374 } | 1356 } |
| OLD | NEW |