| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 | 63 |
| 64 # TODO(xhwang): Add this intermediate target because ServiceTest doesn't support | 64 # TODO(xhwang): Add this intermediate target because ServiceTest doesn't support |
| 65 # services that depend on shared libraries in component build. | 65 # services that depend on shared libraries in component build. |
| 66 # See http://crbug.com/670094 | 66 # See http://crbug.com/670094 |
| 67 source_set("lib") { | 67 source_set("lib") { |
| 68 sources = [ | 68 sources = [ |
| 69 "gpu_mojo_media_client.cc", | 69 "gpu_mojo_media_client.cc", |
| 70 "gpu_mojo_media_client.h", | 70 "gpu_mojo_media_client.h", |
| 71 "interface_factory_impl.cc", | 71 "interface_factory_impl.cc", |
| 72 "interface_factory_impl.h", | 72 "interface_factory_impl.h", |
| 73 "media_interface_provider.cc", |
| 74 "media_interface_provider.h", |
| 73 "media_mojo_export.h", | 75 "media_mojo_export.h", |
| 74 "media_resource_shim.cc", | 76 "media_resource_shim.cc", |
| 75 "media_resource_shim.h", | 77 "media_resource_shim.h", |
| 76 "media_service.cc", | 78 "media_service.cc", |
| 77 "media_service.h", | 79 "media_service.h", |
| 78 "media_service_factory.cc", | 80 "media_service_factory.cc", |
| 79 "media_service_factory.h", | 81 "media_service_factory.h", |
| 80 "mojo_audio_decoder_service.cc", | 82 "mojo_audio_decoder_service.cc", |
| 81 "mojo_audio_decoder_service.h", | 83 "mojo_audio_decoder_service.h", |
| 82 "mojo_audio_output_stream.cc", | 84 "mojo_audio_output_stream.cc", |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 service_test("media_service_unittests") { | 174 service_test("media_service_unittests") { |
| 173 testonly = true | 175 testonly = true |
| 174 | 176 |
| 175 sources = [ | 177 sources = [ |
| 176 "media_service_unittest.cc", | 178 "media_service_unittest.cc", |
| 177 ] | 179 ] |
| 178 | 180 |
| 179 catalog = ":media_service_unittests_catalog" | 181 catalog = ":media_service_unittests_catalog" |
| 180 | 182 |
| 181 deps = [ | 183 deps = [ |
| 184 ":lib", |
| 182 "//base", | 185 "//base", |
| 183 "//media", | 186 "//media", |
| 184 "//media/base:test_support", | 187 "//media/base:test_support", |
| 185 "//media/mojo/clients", | 188 "//media/mojo/clients", |
| 186 "//media/mojo/common", | 189 "//media/mojo/common", |
| 187 "//media/mojo/interfaces", | 190 "//media/mojo/interfaces", |
| 188 "//services/service_manager/public/cpp:service_test_support", | 191 "//services/service_manager/public/cpp:service_test_support", |
| 189 "//testing/gmock", | 192 "//testing/gmock", |
| 190 "//testing/gtest", | 193 "//testing/gtest", |
| 191 ] | 194 ] |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 | 230 |
| 228 catalog("media_service_unittests_catalog") { | 231 catalog("media_service_unittests_catalog") { |
| 229 embedded_services = [ ":test_manifest" ] | 232 embedded_services = [ ":test_manifest" ] |
| 230 standalone_services = [ ":media_manifest" ] | 233 standalone_services = [ ":media_manifest" ] |
| 231 } | 234 } |
| 232 | 235 |
| 233 catalog("media_pipeline_integration_unittests_catalog") { | 236 catalog("media_pipeline_integration_unittests_catalog") { |
| 234 embedded_services = [ ":pipeline_test_manifest" ] | 237 embedded_services = [ ":pipeline_test_manifest" ] |
| 235 standalone_services = [ ":media_manifest" ] | 238 standalone_services = [ ":media_manifest" ] |
| 236 } | 239 } |
| OLD | NEW |