| 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 "//media", | 120 "//media", |
| 121 "//media/mojo/interfaces", | 121 "//media/mojo/interfaces", |
| 122 "//mojo/public/cpp/bindings", | 122 "//mojo/public/cpp/bindings", |
| 123 "//mojo/public/cpp/system", | 123 "//mojo/public/cpp/system", |
| 124 "//services/service_manager/public/cpp", | 124 "//services/service_manager/public/cpp", |
| 125 "//url", | 125 "//url", |
| 126 ] | 126 ] |
| 127 | 127 |
| 128 deps = [ | 128 deps = [ |
| 129 "//media:cdm_api", | 129 "//media:cdm_api", |
| 130 "//media:cdm_manager", |
| 130 "//media:shared_memory_support", | 131 "//media:shared_memory_support", |
| 131 "//media/mojo/common", | 132 "//media/mojo/common", |
| 132 "//mojo/common", | 133 "//mojo/common", |
| 133 "//services/service_manager/public/interfaces", | 134 "//services/service_manager/public/interfaces", |
| 134 ] | 135 ] |
| 135 | 136 |
| 136 if (is_android) { | 137 if (is_android) { |
| 137 sources += [ | 138 sources += [ |
| 138 "android_mojo_media_client.cc", | 139 "android_mojo_media_client.cc", |
| 139 "android_mojo_media_client.h", | 140 "android_mojo_media_client.h", |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 | 231 |
| 231 catalog("media_service_unittests_catalog") { | 232 catalog("media_service_unittests_catalog") { |
| 232 embedded_services = [ ":test_manifest" ] | 233 embedded_services = [ ":test_manifest" ] |
| 233 standalone_services = [ ":media_manifest" ] | 234 standalone_services = [ ":media_manifest" ] |
| 234 } | 235 } |
| 235 | 236 |
| 236 catalog("media_pipeline_integration_unittests_catalog") { | 237 catalog("media_pipeline_integration_unittests_catalog") { |
| 237 embedded_services = [ ":pipeline_test_manifest" ] | 238 embedded_services = [ ":pipeline_test_manifest" ] |
| 238 standalone_services = [ ":media_manifest" ] | 239 standalone_services = [ ":media_manifest" ] |
| 239 } | 240 } |
| OLD | NEW |