| OLD | NEW |
| 1 # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license |
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source |
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found |
| 6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may |
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. |
| 8 | 8 |
| 9 # TODO(andrew): consider moving test_support to src/base/test. | 9 # TODO(andrew): consider moving test_support to src/base/test. |
| 10 { | 10 { |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 '-framework OpenGL', | 394 '-framework OpenGL', |
| 395 '-framework CoreVideo', | 395 '-framework CoreVideo', |
| 396 ], | 396 ], |
| 397 }, | 397 }, |
| 398 }], | 398 }], |
| 399 ], | 399 ], |
| 400 }, | 400 }, |
| 401 }, | 401 }, |
| 402 ], | 402 ], |
| 403 'conditions': [ | 403 'conditions': [ |
| 404 ['include_tests==1 and OS=="android"', { | 404 ['OS=="android"', { |
| 405 'targets': [ | 405 'targets': [ |
| 406 { | 406 { |
| 407 'target_name': 'test_support_unittests_apk_target', | 407 'target_name': 'test_support_unittests_apk_target', |
| 408 'type': 'none', | 408 'type': 'none', |
| 409 'dependencies': [ | 409 'dependencies': [ |
| 410 '<(apk_tests_path):test_support_unittests_apk', | 410 '<(apk_tests_path):test_support_unittests_apk', |
| 411 ], | 411 ], |
| 412 }, | 412 }, |
| 413 ], | 413 ], |
| 414 }], | 414 'conditions': [ |
| 415 ['test_isolation_mode != "noop"', |
| 416 { |
| 417 'targets': [ |
| 418 { |
| 419 'target_name': 'test_support_unittests_apk_run', |
| 420 'type': 'none', |
| 421 'dependencies': [ |
| 422 '<(apk_tests_path):test_support_unittests_apk', |
| 423 ], |
| 424 'includes': [ |
| 425 '../build/isolate.gypi', |
| 426 ], |
| 427 'sources': [ |
| 428 'test_support_unittests_apk.isolate', |
| 429 ], |
| 430 }, |
| 431 ], |
| 432 }, |
| 433 ], |
| 434 ], |
| 435 }], # OS=="android" |
| 415 ['test_isolation_mode != "noop"', { | 436 ['test_isolation_mode != "noop"', { |
| 416 'targets': [ | 437 'targets': [ |
| 417 { | 438 { |
| 418 'target_name': 'test_support_unittests_run', | 439 'target_name': 'test_support_unittests_run', |
| 419 'type': 'none', | 440 'type': 'none', |
| 420 'dependencies': [ | 441 'dependencies': [ |
| 421 'test_support_unittests', | 442 'test_support_unittests', |
| 422 ], | 443 ], |
| 423 'includes': [ | 444 'includes': [ |
| 424 '../build/isolate.gypi', | 445 '../build/isolate.gypi', |
| 425 ], | 446 ], |
| 426 'sources': [ | 447 'sources': [ |
| 427 'test_support_unittests.isolate', | 448 'test_support_unittests.isolate', |
| 428 ], | 449 ], |
| 429 }, | 450 }, |
| 430 ], | 451 ], |
| 431 }], | 452 }], |
| 432 ], | 453 ], |
| 433 } | 454 } |
| OLD | NEW |