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

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

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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
« no previous file with comments | « media/mojo/interfaces/BUILD.gn ('k') | media/mojo/services/main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 25 matching lines...) Expand all
36 "media_type_converters.h", 36 "media_type_converters.h",
37 ] 37 ]
38 38
39 deps = [ 39 deps = [
40 "//base", 40 "//base",
41 "//media", 41 "//media",
42 "//media/mojo/interfaces", 42 "//media/mojo/interfaces",
43 "//mojo/common", 43 "//mojo/common",
44 "//mojo/converters/geometry", 44 "//mojo/converters/geometry",
45 "//mojo/environment:chromium", 45 "//mojo/environment:chromium",
46 "//third_party/mojo/src/mojo/public/c/system:for_component", 46 "//mojo/public/c/system:for_component",
47 "//ui/mojo/geometry:interfaces", 47 "//ui/mojo/geometry:interfaces",
48 ] 48 ]
49 } 49 }
50 50
51 # Implementations of media C++ interfaces using corresponding mojo services. 51 # Implementations of media C++ interfaces using corresponding mojo services.
52 source_set("proxy") { 52 source_set("proxy") {
53 sources = [ 53 sources = [
54 "mojo_cdm.cc", 54 "mojo_cdm.cc",
55 "mojo_cdm.h", 55 "mojo_cdm.h",
56 "mojo_cdm_factory.cc", 56 "mojo_cdm_factory.cc",
(...skipping 10 matching lines...) Expand all
67 public_configs = [ ":enable_mojo_media_config" ] 67 public_configs = [ ":enable_mojo_media_config" ]
68 68
69 deps = [ 69 deps = [
70 ":converters", 70 ":converters",
71 "//base", 71 "//base",
72 "//media", 72 "//media",
73 "//media/mojo/interfaces", 73 "//media/mojo/interfaces",
74 "//mojo/application/public/interfaces", 74 "//mojo/application/public/interfaces",
75 "//mojo/common", 75 "//mojo/common",
76 "//mojo/environment:chromium", 76 "//mojo/environment:chromium",
77 "//third_party/mojo/src/mojo/public/c/system:for_component", 77 "//mojo/public/c/system:for_component",
78 ] 78 ]
79 } 79 }
80 80
81 source_set("media_client") { 81 source_set("media_client") {
82 if (is_android) { 82 if (is_android) {
83 sources = [ 83 sources = [
84 "android_mojo_media_client.cc", 84 "android_mojo_media_client.cc",
85 ] 85 ]
86 } else { 86 } else {
87 sources = [ 87 sources = [
(...skipping 13 matching lines...) Expand all
101 source_set("cdm_service") { 101 source_set("cdm_service") {
102 deps = [ 102 deps = [
103 ":converters", 103 ":converters",
104 ":media_client", 104 ":media_client",
105 "//base", 105 "//base",
106 "//media", 106 "//media",
107 "//media/mojo/interfaces", 107 "//media/mojo/interfaces",
108 "//mojo/application/public/interfaces", 108 "//mojo/application/public/interfaces",
109 "//mojo/common", 109 "//mojo/common",
110 "//mojo/environment:chromium", 110 "//mojo/environment:chromium",
111 "//third_party/mojo/src/mojo/public/c/system:for_component", 111 "//mojo/public/c/system:for_component",
112 ] 112 ]
113 113
114 sources = [ 114 sources = [
115 "mojo_cdm_promise.cc", 115 "mojo_cdm_promise.cc",
116 "mojo_cdm_promise.h", 116 "mojo_cdm_promise.h",
117 "mojo_cdm_service.cc", 117 "mojo_cdm_service.cc",
118 "mojo_cdm_service.h", 118 "mojo_cdm_service.h",
119 "mojo_cdm_service_context.cc", 119 "mojo_cdm_service_context.cc",
120 "mojo_cdm_service_context.h", 120 "mojo_cdm_service_context.h",
121 "mojo_type_trait.h", 121 "mojo_type_trait.h",
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 "service_factory_impl.h", 155 "service_factory_impl.h",
156 ] 156 ]
157 157
158 public_configs = [ ":enable_mojo_media_config" ] 158 public_configs = [ ":enable_mojo_media_config" ]
159 159
160 deps = [ 160 deps = [
161 ":cdm_service", 161 ":cdm_service",
162 ":renderer_service", 162 ":renderer_service",
163 "//base", 163 "//base",
164 "//mojo/application/public/cpp", 164 "//mojo/application/public/cpp",
165 "//third_party/mojo/src/mojo/public/c/system:for_component", 165 "//mojo/public/c/system:for_component",
166 ] 166 ]
167 } 167 }
168 168
169 test("media_mojo_unittests") { 169 test("media_mojo_unittests") {
170 sources = [ 170 sources = [
171 "media_type_converters_unittest.cc", 171 "media_type_converters_unittest.cc",
172 ] 172 ]
173 173
174 deps = [ 174 deps = [
175 ":converters", 175 ":converters",
176 "//base", 176 "//base",
177 "//base/test:test_support", 177 "//base/test:test_support",
178 "//media", 178 "//media",
179 "//media/mojo/interfaces", 179 "//media/mojo/interfaces",
180 "//mojo/environment:chromium", 180 "//mojo/environment:chromium",
181 "//testing/gtest", 181 "//testing/gtest",
182 "//third_party/mojo/src/mojo/edk/system", 182 "//third_party/mojo/src/mojo/edk/system",
183 "//third_party/mojo/src/mojo/edk/test:run_all_unittests", 183 "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
184 ] 184 ]
185 } 185 }
186 186
187 mojo_native_application("media") { 187 mojo_native_application("media") {
188 sources = [ 188 sources = [
189 "main.cc", 189 "main.cc",
190 ] 190 ]
191 191
192 deps = [ 192 deps = [
193 ":application", 193 ":application",
194 "//third_party/mojo/src/mojo/public/c/system:for_shared_library", 194 "//mojo/public/c/system:for_shared_library",
195 ] 195 ]
196 } 196 }
197 197
198 # Note, the following tests must be loaded via mojo_runner as an app, e.g. 198 # Note, the following tests must be loaded via mojo_runner as an app, e.g.
199 # 199 #
200 # out/Debug/mojo_runner mojo:media_apptests 200 # out/Debug/mojo_runner mojo:media_apptests
201 # out/Debug/mojo_runner mojo:media_pipeline_integration_apptests 201 # out/Debug/mojo_runner mojo:media_pipeline_integration_apptests
202 # 202 #
203 mojo_native_application("media_apptests") { 203 mojo_native_application("media_apptests") {
204 testonly = true 204 testonly = true
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 ":media_mojo_unittests", 248 ":media_mojo_unittests",
249 ] 249 ]
250 250
251 if (!is_component_build) { 251 if (!is_component_build) {
252 deps += [ 252 deps += [
253 ":media_apptests", 253 ":media_apptests",
254 ":media_pipeline_integration_apptests", 254 ":media_pipeline_integration_apptests",
255 ] 255 ]
256 } 256 }
257 } 257 }
OLDNEW
« no previous file with comments | « media/mojo/interfaces/BUILD.gn ('k') | media/mojo/services/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698