Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") |
| 6 import("//build/config/arm.gni") | 6 import("//build/config/arm.gni") |
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 8 import("//build/config/linux/pkg_config.gni") | 8 import("//build/config/linux/pkg_config.gni") |
| 9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
| 10 import("//media/media_options.gni") | 10 import("//media/media_options.gni") |
| (...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 558 "//media/base:test_support", | 558 "//media/base:test_support", |
| 559 "//media/test:pipeline_integration_tests", | 559 "//media/test:pipeline_integration_tests", |
| 560 "//skia", # Direct dependency required to inherit config. | 560 "//skia", # Direct dependency required to inherit config. |
| 561 "//testing/gmock", | 561 "//testing/gmock", |
| 562 "//testing/gtest", | 562 "//testing/gtest", |
| 563 "//third_party/widevine/cdm:version_h", | 563 "//third_party/widevine/cdm:version_h", |
| 564 "//ui/gfx:test_support", | 564 "//ui/gfx:test_support", |
| 565 "//url", | 565 "//url", |
| 566 ] | 566 ] |
| 567 | 567 |
| 568 isolate_file = "media_unittests.isolate" | |
|
ddorwin
2015/05/21 02:55:49
This applies to all platforms unlike the GYP chang
mikecase (-- gone --)
2015/05/21 18:46:45
Thanks for the catch. Since this variable wouldn't
| |
| 569 | |
| 568 if (is_android) { | 570 if (is_android) { |
| 569 deps += [ | 571 deps += [ |
| 570 "//media/base/android", | 572 "//media/base/android", |
| 571 # TODO(GYP) | 573 # TODO(GYP) |
| 572 #"//testing/android/native_test:native_test_native_code" | 574 #"//testing/android/native_test:native_test_native_code" |
| 573 ] | 575 ] |
| 574 } | 576 } |
| 575 | 577 |
| 576 if (media_use_ffmpeg) { | 578 if (media_use_ffmpeg) { |
| 577 sources += [ | 579 sources += [ |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 650 "//media/base:test_support", | 652 "//media/base:test_support", |
| 651 "//media/test:pipeline_integration_perftests", | 653 "//media/test:pipeline_integration_perftests", |
| 652 "//testing/gmock", | 654 "//testing/gmock", |
| 653 "//testing/gtest", | 655 "//testing/gtest", |
| 654 "//testing/perf", | 656 "//testing/perf", |
| 655 "//third_party/widevine/cdm:version_h", | 657 "//third_party/widevine/cdm:version_h", |
| 656 "//ui/gfx:test_support", | 658 "//ui/gfx:test_support", |
| 657 ] | 659 ] |
| 658 if (is_android) { | 660 if (is_android) { |
| 659 deps += [ "//ui/gl" ] | 661 deps += [ "//ui/gl" ] |
| 662 isolate_file = "media_perftests.isolate" | |
| 660 } | 663 } |
| 661 if (media_use_ffmpeg) { | 664 if (media_use_ffmpeg) { |
| 662 deps += [ "//third_party/ffmpeg" ] # Direct dependency required to inherit config. | 665 deps += [ "//third_party/ffmpeg" ] # Direct dependency required to inherit config. |
| 663 } | 666 } |
| 664 } | 667 } |
| 665 | 668 |
| 666 # For running the subset of media_unittests that might require audio hardware | 669 # For running the subset of media_unittests that might require audio hardware |
| 667 # separately on GPU bots. media_unittests includes these too. | 670 # separately on GPU bots. media_unittests includes these too. |
| 668 test("audio_unittests") { | 671 test("audio_unittests") { |
| 669 sources = [ | 672 sources = [ |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 735 "//media/base:test_support", | 738 "//media/base:test_support", |
| 736 "//media/test:pipeline_integration_tests", | 739 "//media/test:pipeline_integration_tests", |
| 737 "//testing/gmock", | 740 "//testing/gmock", |
| 738 "//testing/gtest", | 741 "//testing/gtest", |
| 739 "//third_party/ffmpeg", | 742 "//third_party/ffmpeg", |
| 740 "//ui/gfx/geometry", | 743 "//ui/gfx/geometry", |
| 741 "//ui/gfx:test_support", | 744 "//ui/gfx:test_support", |
| 742 ] | 745 ] |
| 743 } | 746 } |
| 744 } | 747 } |
| OLD | NEW |