| 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 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 }], | 307 }], |
| 308 ['OS=="linux" and use_allocator!="none"', { | 308 ['OS=="linux" and use_allocator!="none"', { |
| 309 'dependencies': [ | 309 'dependencies': [ |
| 310 # See http://crbug.com/162998#c4 for why this is needed. | 310 # See http://crbug.com/162998#c4 for why this is needed. |
| 311 '../../base/allocator/allocator.gyp:allocator', | 311 '../../base/allocator/allocator.gyp:allocator', |
| 312 ], | 312 ], |
| 313 }], | 313 }], |
| 314 ], | 314 ], |
| 315 }, | 315 }, |
| 316 ], | 316 ], |
| 317 'conditions': [ |
| 318 ['test_isolation_mode != "noop"', { |
| 319 'targets': [ |
| 320 { |
| 321 'target_name': 'aura_unittests_run', |
| 322 'type': 'none', |
| 323 'dependencies': [ |
| 324 'aura_unittests', |
| 325 ], |
| 326 'includes': [ |
| 327 '../../build/isolate.gypi', |
| 328 ], |
| 329 'sources': [ |
| 330 'aura_unittests.isolate', |
| 331 ], |
| 332 }, |
| 333 ], |
| 334 }], |
| 335 ], |
| 317 } | 336 } |
| OLD | NEW |