| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 '../../chrome/chrome_resources.gyp:packed_resources', | 266 '../../chrome/chrome_resources.gyp:packed_resources', |
| 267 'ui_base_unittests', | 267 'ui_base_unittests', |
| 268 ], | 268 ], |
| 269 'variables': { | 269 'variables': { |
| 270 'test_suite_name': 'ui_base_unittests', | 270 'test_suite_name': 'ui_base_unittests', |
| 271 }, | 271 }, |
| 272 'includes': [ '../../build/apk_test.gypi' ], | 272 'includes': [ '../../build/apk_test.gypi' ], |
| 273 }, | 273 }, |
| 274 ], | 274 ], |
| 275 }], | 275 }], |
| 276 ['test_isolation_mode != "noop"', { | |
| 277 'targets': [ | |
| 278 { | |
| 279 'target_name': 'ui_base_unittests_run', | |
| 280 'type': 'none', | |
| 281 'dependencies': [ | |
| 282 'ui_base_unittests', | |
| 283 ], | |
| 284 'includes': [ | |
| 285 '../../build/isolate.gypi', | |
| 286 ], | |
| 287 'sources': [ | |
| 288 'ui_base_unittests.isolate', | |
| 289 ], | |
| 290 'conditions': [ | |
| 291 ['use_x11 == 1', { | |
| 292 'dependencies': [ | |
| 293 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | |
| 294 ], | |
| 295 }], | |
| 296 ], | |
| 297 }, | |
| 298 ], | |
| 299 }], | |
| 300 ], | 276 ], |
| 301 } | 277 } |
| OLD | NEW |