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("//media/media_options.gni") | 5 import("//media/media_options.gni") |
| 6 import("//services/service_manager/public/cpp/service.gni") | 6 import("//services/service_manager/public/cpp/service.gni") |
| 7 import("//services/service_manager/public/service_manifest.gni") | 7 import("//services/service_manager/public/service_manifest.gni") |
| 8 import("//testing/test.gni") | 8 import("//testing/test.gni") |
| 9 | 9 |
| 10 config("mojo_media_config") { | 10 config("mojo_media_config") { |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 145 ":lib", | 145 ":lib", |
| 146 "//mojo/public/c/system", | 146 "//mojo/public/c/system", |
| 147 "//services/service_manager/public/cpp", | 147 "//services/service_manager/public/cpp", |
| 148 ] | 148 ] |
| 149 | 149 |
| 150 data_deps = [ | 150 data_deps = [ |
| 151 ":media_manifest", | 151 ":media_manifest", |
| 152 ] | 152 ] |
| 153 } | 153 } |
| 154 | 154 |
| 155 test("media_service_unittests") { | 155 # crbug.com/676055: media_service_unittests currently fails to link in Windows c omponent 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.
| |
| 156 testonly = true | 156 if (!(is_win && is_component_build)) { |
| 157 test("media_service_unittests") { | |
| 158 testonly = true | |
| 157 | 159 |
| 158 sources = [ | 160 sources = [ |
| 159 "media_service_unittest.cc", | 161 "media_service_unittest.cc", |
| 160 ] | 162 ] |
| 161 | 163 |
| 162 deps = [ | 164 deps = [ |
| 163 "//media", | 165 "//media", |
| 164 "//media/base:test_support", | 166 "//media/base:test_support", |
| 165 "//media/mojo/clients", | 167 "//media/mojo/clients", |
| 166 "//media/mojo/common", | 168 "//media/mojo/common", |
| 167 "//media/mojo/interfaces", | 169 "//media/mojo/interfaces", |
| 168 "//services/service_manager/public/cpp:service_test_support", | 170 "//services/service_manager/public/cpp:service_test_support", |
| 169 "//services/service_manager/public/cpp/test:run_all_service_tests", | 171 "//services/service_manager/public/cpp/test:run_all_service_tests", |
| 170 "//testing/gmock", | 172 "//testing/gmock", |
| 171 "//testing/gtest", | 173 "//testing/gtest", |
| 172 ] | 174 ] |
| 173 | 175 |
| 174 data_deps = [ | 176 data_deps = [ |
| 175 ":media", | 177 ":media", |
| 176 ":test_manifest", | 178 ":test_manifest", |
| 177 ] | 179 ] |
| 178 } | 180 } |
| 181 } # 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
| |
| 179 | 182 |
| 180 service_manifest("media_manifest") { | 183 service_manifest("media_manifest") { |
| 181 name = "media" | 184 name = "media" |
| 182 source = "media_manifest.json" | 185 source = "media_manifest.json" |
| 183 } | 186 } |
| 184 | 187 |
| 185 service_manifest("test_manifest") { | 188 service_manifest("test_manifest") { |
| 186 name = "media_service_unittests" | 189 name = "media_service_unittests" |
| 187 source = "test_manifest.json" | 190 source = "test_manifest.json" |
| 188 } | 191 } |
| 189 | 192 |
| 190 test("media_pipeline_integration_unittests") { | 193 test("media_pipeline_integration_unittests") { |
| 191 testonly = true | 194 testonly = true |
| 192 | 195 |
| 193 deps = [ | 196 deps = [ |
| 194 "//media/test:mojo_pipeline_integration_tests", | 197 "//media/test:mojo_pipeline_integration_tests", |
| 195 "//services/service_manager/public/cpp/test:run_all_service_tests", | 198 "//services/service_manager/public/cpp/test:run_all_service_tests", |
| 196 ] | 199 ] |
| 197 | 200 |
| 198 data_deps = [ | 201 data_deps = [ |
| 199 ":media", | 202 ":media", |
| 200 ":pipeline_test_manifest", | 203 ":pipeline_test_manifest", |
| 201 ] | 204 ] |
| 202 } | 205 } |
| 203 | 206 |
| 204 service_manifest("pipeline_test_manifest") { | 207 service_manifest("pipeline_test_manifest") { |
| 205 name = "media_pipeline_integration_unittests" | 208 name = "media_pipeline_integration_unittests" |
| 206 source = "pipeline_test_manifest.json" | 209 source = "pipeline_test_manifest.json" |
| 207 } | 210 } |
| OLD | NEW |