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

Side by Side Diff: mojo/mojo_services.gypi

Issue 267293004: Wires up view manager to an actual display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 7 months 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 | Annotate | Revision Log
« no previous file with comments | « mojo/mojo_examples.gypi ('k') | mojo/services/native_viewport/native_viewport_service.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 { 1 {
2 'targets': [ 2 'targets': [
3 { 3 {
4 'target_name': 'mojo_echo_bindings', 4 'target_name': 'mojo_echo_bindings',
5 'type': 'static_library', 5 'type': 'static_library',
6 'sources': [ 6 'sources': [
7 'services/dbus_echo/echo.mojom', 7 'services/dbus_echo/echo.mojom',
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'mojom_base_output_dir': 'mojo', 10 'mojom_base_output_dir': 'mojo',
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 ], 172 ],
173 }, 173 },
174 { 174 {
175 'target_name': 'mojo_view_manager_lib_unittests', 175 'target_name': 'mojo_view_manager_lib_unittests',
176 'type': 'executable', 176 'type': 'executable',
177 'dependencies': [ 177 'dependencies': [
178 '../base/base.gyp:base', 178 '../base/base.gyp:base',
179 '../base/base.gyp:test_support_base', 179 '../base/base.gyp:test_support_base',
180 '../testing/gtest.gyp:gtest', 180 '../testing/gtest.gyp:gtest',
181 'mojo_environment_chromium', 181 'mojo_environment_chromium',
182 'mojo_run_all_unittests',
183 'mojo_shell_test_support', 182 'mojo_shell_test_support',
184 'mojo_view_manager_bindings', 183 'mojo_view_manager_bindings',
185 'mojo_view_manager_lib', 184 'mojo_view_manager_lib',
186 ], 185 ],
187 'sources': [ 186 'sources': [
188 'services/public/cpp/view_manager/tests/view_unittest.cc', 187 'services/public/cpp/view_manager/tests/view_unittest.cc',
189 'services/public/cpp/view_manager/tests/view_manager_unittest.cc', 188 'services/public/cpp/view_manager/tests/view_manager_unittest.cc',
190 'services/public/cpp/view_manager/tests/view_tree_host_unittest.cc', 189 'services/public/cpp/view_manager/tests/view_tree_host_unittest.cc',
191 'services/public/cpp/view_manager/tests/view_tree_node_unittest.cc', 190 'services/public/cpp/view_manager/tests/view_tree_node_unittest.cc',
192 ], 191 ],
192 'conditions': [
193 ['use_aura==1', {
194 'dependencies': [
195 'mojo_view_manager_run_unittests'
196 ],
197 }, { # use_aura==0
198 'dependencies': [
199 'mojo_run_all_unittests',
200 ],
201 }]
202 ],
193 }, 203 },
194 ], 204 ],
195 'conditions': [ 205 'conditions': [
196 ['use_aura==1', { 206 ['use_aura==1', {
197 'targets': [ 207 'targets': [
198 { 208 {
199 'target_name': 'mojo_view_manager', 209 'target_name': 'mojo_view_manager',
200 'type': '<(component)', 210 'type': '<(component)',
201 'dependencies': [ 211 'dependencies': [
202 '../base/base.gyp:base', 212 '../base/base.gyp:base',
203 '../skia/skia.gyp:skia', 213 '../skia/skia.gyp:skia',
204 '../ui/aura/aura.gyp:aura', 214 '../ui/aura/aura.gyp:aura',
215 '../ui/base/ui_base.gyp:ui_base',
216 '../ui/gfx/gfx.gyp:gfx',
205 '../ui/gfx/gfx.gyp:gfx_geometry', 217 '../ui/gfx/gfx.gyp:gfx_geometry',
218 'mojo_aura_support',
206 'mojo_common_lib', 219 'mojo_common_lib',
207 'mojo_environment_chromium', 220 'mojo_environment_chromium',
221 'mojo_gles2',
208 'mojo_launcher_bindings', 222 'mojo_launcher_bindings',
209 'mojo_native_viewport_bindings', 223 'mojo_native_viewport_bindings',
210 'mojo_shell_client', 224 'mojo_shell_client',
211 'mojo_system_impl', 225 'mojo_system_impl',
212 'mojo_view_manager_bindings', 226 'mojo_view_manager_bindings',
213 'mojo_view_manager_common', 227 'mojo_view_manager_common',
214 ], 228 ],
215 'sources': [ 229 'sources': [
216 'services/view_manager/ids.h', 230 'services/view_manager/ids.h',
231 'services/view_manager/main.cc',
217 'services/view_manager/node.cc', 232 'services/view_manager/node.cc',
218 'services/view_manager/node.h', 233 'services/view_manager/node.h',
219 'services/view_manager/node_delegate.h', 234 'services/view_manager/node_delegate.h',
220 'services/view_manager/root_node_manager.cc', 235 'services/view_manager/root_node_manager.cc',
221 'services/view_manager/root_node_manager.h', 236 'services/view_manager/root_node_manager.h',
237 'services/view_manager/root_view_manager.cc',
238 'services/view_manager/root_view_manager.h',
222 'services/view_manager/view.cc', 239 'services/view_manager/view.cc',
223 'services/view_manager/view.h', 240 'services/view_manager/view.h',
224 'services/view_manager/view_manager.cc',
225 'services/view_manager/view_manager_connection.cc', 241 'services/view_manager/view_manager_connection.cc',
226 'services/view_manager/view_manager_connection.h', 242 'services/view_manager/view_manager_connection.h',
227 'services/view_manager/view_manager_export.h', 243 'services/view_manager/view_manager_export.h',
228 ], 244 ],
229 'defines': [ 245 'defines': [
230 'MOJO_VIEW_MANAGER_IMPLEMENTATION', 246 'MOJO_VIEW_MANAGER_IMPLEMENTATION',
231 ], 247 ],
232 }, 248 },
233 { 249 {
250 'target_name': 'mojo_view_manager_run_unittests',
251 'type': 'static_library',
252 'dependencies': [
253 '../base/base.gyp:base',
254 '../base/base.gyp:test_support_base',
255 '../ui/gl/gl.gyp:gl',
256 ],
257 'sources': [
258 'services/public/cpp/view_manager/lib/view_manager_test_suite.cc',
259 'services/public/cpp/view_manager/lib/view_manager_test_suite.h',
260 'services/public/cpp/view_manager/lib/view_manager_unittests.cc',
261 ],
262 },
263 {
234 'target_name': 'mojo_view_manager_unittests', 264 'target_name': 'mojo_view_manager_unittests',
235 'type': 'executable', 265 'type': 'executable',
236 'dependencies': [ 266 'dependencies': [
237 '../base/base.gyp:base', 267 '../base/base.gyp:base',
238 '../base/base.gyp:run_all_unittests', 268 '../base/base.gyp:test_support_base',
239 '../skia/skia.gyp:skia', 269 '../skia/skia.gyp:skia',
240 '../testing/gtest.gyp:gtest', 270 '../testing/gtest.gyp:gtest',
241 '../ui/aura/aura.gyp:aura', 271 '../ui/aura/aura.gyp:aura',
272 '../ui/gl/gl.gyp:gl',
242 'mojo_environment_chromium', 273 'mojo_environment_chromium',
243 'mojo_shell_client', 274 'mojo_shell_client',
244 'mojo_shell_test_support', 275 'mojo_shell_test_support',
245 'mojo_system_impl', 276 'mojo_system_impl',
246 'mojo_view_manager_bindings', 277 'mojo_view_manager_bindings',
247 'mojo_view_manager_common', 278 'mojo_view_manager_common',
279 'mojo_view_manager_run_unittests',
248 ], 280 ],
249 'sources': [ 281 'sources': [
250 'services/view_manager/view_manager_connection_unittest.cc', 282 'services/view_manager/view_manager_connection_unittest.cc',
251 ], 283 ],
252 }, 284 },
253 { 285 {
254 'target_name': 'package_mojo_view_manager', 286 'target_name': 'package_mojo_view_manager',
255 'variables': { 287 'variables': {
256 'app_name': 'mojo_view_manager', 288 'app_name': 'mojo_view_manager',
257 }, 289 },
(...skipping 18 matching lines...) Expand all
276 'mojo_system_impl', 308 'mojo_system_impl',
277 ], 309 ],
278 'sources': [ 310 'sources': [
279 'services/dbus_echo/dbus_echo_service.cc', 311 'services/dbus_echo/dbus_echo_service.cc',
280 ], 312 ],
281 }, 313 },
282 ], 314 ],
283 }], 315 }],
284 ], 316 ],
285 } 317 }
OLDNEW
« no previous file with comments | « mojo/mojo_examples.gypi ('k') | mojo/services/native_viewport/native_viewport_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698