| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 "//media:shared_memory_support", | 128 "//media:shared_memory_support", |
| 129 "//media/mojo/common", | 129 "//media/mojo/common", |
| 130 "//mojo/common", | 130 "//mojo/common", |
| 131 "//services/service_manager/public/interfaces", | 131 "//services/service_manager/public/interfaces", |
| 132 ] | 132 ] |
| 133 | 133 |
| 134 if (is_android) { | 134 if (is_android) { |
| 135 sources += [ | 135 sources += [ |
| 136 "android_mojo_media_client.cc", | 136 "android_mojo_media_client.cc", |
| 137 "android_mojo_media_client.h", | 137 "android_mojo_media_client.h", |
| 138 "mojo_media_drm_storage.cc", |
| 139 "mojo_media_drm_storage.h", |
| 138 ] | 140 ] |
| 139 } | 141 } |
| 140 } | 142 } |
| 141 | 143 |
| 142 service("media") { | 144 service("media") { |
| 143 testonly = true | 145 testonly = true |
| 144 | 146 |
| 145 # crbug.com/676418: Suppress symbol import warnings. | 147 # crbug.com/676418: Suppress symbol import warnings. |
| 146 if (is_win && is_component_build) { | 148 if (is_win && is_component_build) { |
| 147 ldflags = [ "/ignore:4217" ] | 149 ldflags = [ "/ignore:4217" ] |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 | 227 |
| 226 catalog("media_service_unittests_catalog") { | 228 catalog("media_service_unittests_catalog") { |
| 227 embedded_services = [ ":test_manifest" ] | 229 embedded_services = [ ":test_manifest" ] |
| 228 standalone_services = [ ":media_manifest" ] | 230 standalone_services = [ ":media_manifest" ] |
| 229 } | 231 } |
| 230 | 232 |
| 231 catalog("media_pipeline_integration_unittests_catalog") { | 233 catalog("media_pipeline_integration_unittests_catalog") { |
| 232 embedded_services = [ ":pipeline_test_manifest" ] | 234 embedded_services = [ ":pipeline_test_manifest" ] |
| 233 standalone_services = [ ":media_manifest" ] | 235 standalone_services = [ ":media_manifest" ] |
| 234 } | 236 } |
| OLD | NEW |