| 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/catalog/public/tools/catalog.gni") | 6 import("//services/catalog/public/tools/catalog.gni") |
| 7 import("//services/service_manager/public/cpp/service.gni") | 7 import("//services/service_manager/public/cpp/service.gni") |
| 8 import("//services/service_manager/public/service_manifest.gni") | 8 import("//services/service_manager/public/service_manifest.gni") |
| 9 import("//services/service_manager/public/tools/test/service_test.gni") | 9 import("//services/service_manager/public/tools/test/service_test.gni") |
| 10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 public_deps = [ | 146 public_deps = [ |
| 147 "//base", | 147 "//base", |
| 148 "//media", | 148 "//media", |
| 149 ] | 149 ] |
| 150 | 150 |
| 151 deps = [ | 151 deps = [ |
| 152 ":lib", | 152 ":lib", |
| 153 "//mojo/public/c/system", | 153 "//mojo/public/c/system", |
| 154 "//services/service_manager/public/cpp", | 154 "//services/service_manager/public/cpp", |
| 155 ] | 155 ] |
| 156 | |
| 157 data_deps = [ | |
| 158 ":media_manifest", | |
| 159 ] | |
| 160 } | 156 } |
| 161 | 157 |
| 162 # crbug.com/676055: media_service_unittests currently fails to link in Windows | 158 # crbug.com/676055: media_service_unittests currently fails to link in Windows |
| 163 # component builds, so don't declare it, otherwise the "all" target will still | 159 # component builds, so don't declare it, otherwise the "all" target will still |
| 164 # try to build it. | 160 # try to build it. |
| 165 if (!(is_win && is_component_build)) { | 161 if (!(is_win && is_component_build)) { |
| 166 service_test("media_service_unittests") { | 162 service_test("media_service_unittests") { |
| 167 testonly = true | 163 testonly = true |
| 168 | 164 |
| 169 sources = [ | 165 sources = [ |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 test("media_pipeline_integration_unittests") { | 199 test("media_pipeline_integration_unittests") { |
| 204 testonly = true | 200 testonly = true |
| 205 | 201 |
| 206 deps = [ | 202 deps = [ |
| 207 "//media/test:mojo_pipeline_integration_tests", | 203 "//media/test:mojo_pipeline_integration_tests", |
| 208 "//services/service_manager/public/cpp/test:run_all_service_tests", | 204 "//services/service_manager/public/cpp/test:run_all_service_tests", |
| 209 ] | 205 ] |
| 210 | 206 |
| 211 data_deps = [ | 207 data_deps = [ |
| 212 ":media", | 208 ":media", |
| 213 ":pipeline_test_manifest", | |
| 214 ] | 209 ] |
| 215 } | 210 } |
| 216 | 211 |
| 217 service_manifest("pipeline_test_manifest") { | 212 service_manifest("pipeline_test_manifest") { |
| 218 name = "media_pipeline_integration_unittests" | 213 name = "media_pipeline_integration_unittests" |
| 219 source = "pipeline_test_manifest.json" | 214 source = "pipeline_test_manifest.json" |
| 220 } | 215 } |
| 221 | 216 |
| 222 catalog("media_service_unittests_catalog") { | 217 catalog("media_service_unittests_catalog") { |
| 223 embedded_services = [ ":test_manifest" ] | 218 embedded_services = [ ":test_manifest" ] |
| 224 standalone_services = [ ":media_manifest" ] | 219 standalone_services = [ ":media_manifest" ] |
| 225 } | 220 } |
| OLD | NEW |