Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side Diff: media/mojo/services/BUILD.gn

Issue 1525863002: Remove renderer_service -> media_client dependency. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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("//testing/test.gni") 6 import("//testing/test.gni")
7 import("//mojo/public/mojo_application.gni") 7 import("//mojo/public/mojo_application.gni")
8 8
9 # Target naming conventions: 9 # Target naming conventions:
10 # - converters: C++/Mojo type converters. 10 # - converters: C++/Mojo type converters.
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 deps = [ 96 deps = [
97 "//base", 97 "//base",
98 "//media", 98 "//media",
99 "//media:shared_memory_support", 99 "//media:shared_memory_support",
100 ] 100 ]
101 } 101 }
102 102
103 source_set("cdm_service") { 103 source_set("cdm_service") {
104 deps = [ 104 deps = [
105 ":converters", 105 ":converters",
106 ":media_client",
107 "//base", 106 "//base",
108 "//media", 107 "//media",
109 "//media/mojo/interfaces", 108 "//media/mojo/interfaces",
110 "//mojo/application/public/interfaces", 109 "//mojo/application/public/interfaces",
111 "//mojo/common", 110 "//mojo/common",
112 "//mojo/environment:chromium", 111 "//mojo/environment:chromium",
113 "//mojo/public/c/system:for_component", 112 "//mojo/public/c/system:for_component",
114 ] 113 ]
115 114
116 sources = [ 115 sources = [
(...skipping 17 matching lines...) Expand all
134 133
135 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 134 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
136 } 135 }
137 136
138 source_set("renderer_service") { 137 source_set("renderer_service") {
139 sources = [ 138 sources = [
140 "demuxer_stream_provider_shim.cc", 139 "demuxer_stream_provider_shim.cc",
141 "demuxer_stream_provider_shim.h", 140 "demuxer_stream_provider_shim.h",
142 "mojo_demuxer_stream_adapter.cc", 141 "mojo_demuxer_stream_adapter.cc",
143 "mojo_demuxer_stream_adapter.h", 142 "mojo_demuxer_stream_adapter.h",
144 "mojo_media_client.cc",
145 "mojo_media_client.h",
146 "mojo_renderer_service.cc", 143 "mojo_renderer_service.cc",
147 "mojo_renderer_service.h", 144 "mojo_renderer_service.h",
148 ] 145 ]
149 146
150 deps = [ 147 deps = [
151 ":converters", 148 ":converters",
152 ":media_client",
153 "//base", 149 "//base",
154 "//media", 150 "//media",
155 "//media:shared_memory_support", 151 "//media:shared_memory_support",
156 "//media/mojo/interfaces", 152 "//media/mojo/interfaces",
157 "//mojo/common", 153 "//mojo/common",
158 ] 154 ]
159 } 155 }
160 156
161 source_set("application") { 157 source_set("application") {
162 sources = [ 158 sources = [
163 "mojo_media_application.cc", 159 "mojo_media_application.cc",
164 "mojo_media_application.h", 160 "mojo_media_application.h",
161 "mojo_media_client.cc",
162 "mojo_media_client.h",
165 "service_factory_impl.cc", 163 "service_factory_impl.cc",
166 "service_factory_impl.h", 164 "service_factory_impl.h",
167 ] 165 ]
168 166
169 public_configs = [ ":enable_mojo_media_config" ] 167 public_configs = [ ":enable_mojo_media_config" ]
170 168
171 deps = [ 169 deps = [
172 ":cdm_service", 170 ":cdm_service",
171 ":media_client",
173 ":renderer_service", 172 ":renderer_service",
174 "//base", 173 "//base",
175 "//mojo/application/public/cpp", 174 "//mojo/application/public/cpp",
176 "//mojo/public/c/system:for_component", 175 "//mojo/public/c/system:for_component",
177 ] 176 ]
178 } 177 }
179 178
180 test("media_mojo_unittests") { 179 test("media_mojo_unittests") {
181 sources = [ 180 sources = [
182 "media_type_converters_unittest.cc", 181 "media_type_converters_unittest.cc",
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 ":media_mojo_unittests", 260 ":media_mojo_unittests",
262 ] 261 ]
263 262
264 if (!is_component_build) { 263 if (!is_component_build) {
265 deps += [ 264 deps += [
266 ":media_apptests", 265 ":media_apptests",
267 ":media_pipeline_integration_apptests", 266 ":media_pipeline_integration_apptests",
268 ] 267 ]
269 } 268 }
270 } 269 }
OLDNEW
« no previous file with comments | « no previous file | media/mojo/services/default_mojo_media_client.cc » ('j') | media/mojo/services/default_mojo_media_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698