Chromium Code Reviews| Index: media/mojo/services/BUILD.gn |
| diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn |
| index 162d435d7be2f0417a65e96cc294ff1e91960115..201e7ed522f3f6f5e624749256e4c13fe0ba8157 100644 |
| --- a/media/mojo/services/BUILD.gn |
| +++ b/media/mojo/services/BUILD.gn |
| @@ -152,30 +152,33 @@ service("media") { |
| ] |
| } |
| -test("media_service_unittests") { |
| - testonly = true |
| +# crbug.com/676055: media_service_unittests currently fails to link in Windows component builds, so don't declare it, otherwise the "all" target will still try to build it. |
|
brucedawson
2016/12/21 18:27:54
Word-wrap at 80 lines.
Wez
2016/12/21 18:54:04
Done.
|
| +if (!(is_win && is_component_build)) { |
| + test("media_service_unittests") { |
| + testonly = true |
| - sources = [ |
| - "media_service_unittest.cc", |
| - ] |
| + sources = [ |
| + "media_service_unittest.cc", |
| + ] |
| - deps = [ |
| - "//media", |
| - "//media/base:test_support", |
| - "//media/mojo/clients", |
| - "//media/mojo/common", |
| - "//media/mojo/interfaces", |
| - "//services/service_manager/public/cpp:service_test_support", |
| - "//services/service_manager/public/cpp/test:run_all_service_tests", |
| - "//testing/gmock", |
| - "//testing/gtest", |
| - ] |
| + deps = [ |
| + "//media", |
| + "//media/base:test_support", |
| + "//media/mojo/clients", |
| + "//media/mojo/common", |
| + "//media/mojo/interfaces", |
| + "//services/service_manager/public/cpp:service_test_support", |
| + "//services/service_manager/public/cpp/test:run_all_service_tests", |
| + "//testing/gmock", |
| + "//testing/gtest", |
| + ] |
| - data_deps = [ |
| - ":media", |
| - ":test_manifest", |
| - ] |
| -} |
| + data_deps = [ |
| + ":media", |
| + ":test_manifest", |
| + ] |
| + } |
| +} # if (!(is_win && is_component_build)) |
|
watk
2016/12/21 18:35:36
total nit, but since you're changing it anyway: th
Wez
2016/12/21 18:54:04
That makes sense for preprocessor conditionals, bu
|
| service_manifest("media_manifest") { |
| name = "media" |