| 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 # A hook that can be overridden in other repositories to add additional | 7 # A hook that can be overridden in other repositories to add additional |
| 8 # compilation targets to 'All'. | 8 # compilation targets to 'All'. |
| 9 'app_targets%': [], | 9 'app_targets%': [], |
| 10 # For Android-specific targets. | 10 # For Android-specific targets. |
| (...skipping 1311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1322 }], | 1322 }], |
| 1323 ['use_ozone==1', { | 1323 ['use_ozone==1', { |
| 1324 'dependencies': [ | 1324 'dependencies': [ |
| 1325 '../ui/ozone/ozone.gyp:*', | 1325 '../ui/ozone/ozone.gyp:*', |
| 1326 '../ui/ozone/demo/ozone_demos.gyp:*', | 1326 '../ui/ozone/demo/ozone_demos.gyp:*', |
| 1327 ], | 1327 ], |
| 1328 }], | 1328 }], |
| 1329 ], | 1329 ], |
| 1330 }, | 1330 }, |
| 1331 ], # targets | 1331 ], # targets |
| 1332 }, { | |
| 1333 'conditions': [ | |
| 1334 ['OS=="linux"', { | |
| 1335 # TODO(thakis): Remove this once the linux gtk bot no longer reference
s | |
| 1336 # it (probably after the first aura release on linux), see r249162 | |
| 1337 'targets': [ | |
| 1338 { | |
| 1339 'target_name': 'aura_builder', | |
| 1340 'type': 'none', | |
| 1341 'dependencies': [ | |
| 1342 '../chrome/chrome.gyp:chrome', | |
| 1343 ], | |
| 1344 }, | |
| 1345 ], # targets | |
| 1346 }]], # OS=="linux" | |
| 1347 }], # "use_aura==1" | 1332 }], # "use_aura==1" |
| 1348 ['test_isolation_mode != "noop"', { | 1333 ['test_isolation_mode != "noop"', { |
| 1349 'targets': [ | 1334 'targets': [ |
| 1350 { | 1335 { |
| 1351 'target_name': 'chromium_swarm_tests', | 1336 'target_name': 'chromium_swarm_tests', |
| 1352 'type': 'none', | 1337 'type': 'none', |
| 1353 'dependencies': [ | 1338 'dependencies': [ |
| 1354 '../base/base.gyp:base_unittests_run', | 1339 '../base/base.gyp:base_unittests_run', |
| 1355 '../chrome/chrome.gyp:browser_tests_run', | 1340 '../chrome/chrome.gyp:browser_tests_run', |
| 1356 '../chrome/chrome.gyp:interactive_ui_tests_run', | 1341 '../chrome/chrome.gyp:interactive_ui_tests_run', |
| (...skipping 25 matching lines...) Expand all Loading... |
| 1382 'dependencies': [ | 1367 'dependencies': [ |
| 1383 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 1368 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
| 1384 '../ui/views/views.gyp:views', | 1369 '../ui/views/views.gyp:views', |
| 1385 '../ui/views/views.gyp:views_unittests', | 1370 '../ui/views/views.gyp:views_unittests', |
| 1386 ], | 1371 ], |
| 1387 }, # target_name: macviews_builder | 1372 }, # target_name: macviews_builder |
| 1388 ], # targets | 1373 ], # targets |
| 1389 }], # os=='mac' and toolkit_views==1 | 1374 }], # os=='mac' and toolkit_views==1 |
| 1390 ], # conditions | 1375 ], # conditions |
| 1391 } | 1376 } |
| OLD | NEW |