| OLD | NEW |
| 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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 'conditions': [ | 196 'conditions': [ |
| 197 ['use_aura==1', { | 197 ['use_aura==1', { |
| 198 'targets': [ | 198 'targets': [ |
| 199 { | 199 { |
| 200 'target_name': 'mojo_view_manager', | 200 'target_name': 'mojo_view_manager', |
| 201 'type': '<(component)', | 201 'type': '<(component)', |
| 202 'dependencies': [ | 202 'dependencies': [ |
| 203 '../base/base.gyp:base', | 203 '../base/base.gyp:base', |
| 204 '../skia/skia.gyp:skia', | 204 '../skia/skia.gyp:skia', |
| 205 '../ui/aura/aura.gyp:aura', | 205 '../ui/aura/aura.gyp:aura', |
| 206 '../ui/base/ui_base.gyp:ui_base', |
| 207 '../ui/gfx/gfx.gyp:gfx', |
| 206 '../ui/gfx/gfx.gyp:gfx_geometry', | 208 '../ui/gfx/gfx.gyp:gfx_geometry', |
| 209 'mojo_aura_support', |
| 207 'mojo_common_lib', | 210 'mojo_common_lib', |
| 208 'mojo_environment_chromium', | 211 'mojo_environment_chromium', |
| 209 'mojo_launcher_bindings', | 212 'mojo_launcher_bindings', |
| 210 'mojo_native_viewport_bindings', | 213 'mojo_native_viewport_bindings', |
| 211 'mojo_shell_client', | 214 'mojo_shell_client', |
| 212 'mojo_system_impl', | 215 'mojo_system_impl', |
| 213 'mojo_view_manager_bindings', | 216 'mojo_view_manager_bindings', |
| 214 'mojo_view_manager_common', | 217 'mojo_view_manager_common', |
| 215 ], | 218 ], |
| 216 'sources': [ | 219 'sources': [ |
| 217 'services/view_manager/ids.h', | 220 'services/view_manager/ids.h', |
| 221 'services/view_manager/main.cc', |
| 218 'services/view_manager/node.cc', | 222 'services/view_manager/node.cc', |
| 219 'services/view_manager/node.h', | 223 'services/view_manager/node.h', |
| 220 'services/view_manager/node_delegate.h', | 224 'services/view_manager/node_delegate.h', |
| 221 'services/view_manager/root_node_manager.cc', | 225 'services/view_manager/root_node_manager.cc', |
| 222 'services/view_manager/root_node_manager.h', | 226 'services/view_manager/root_node_manager.h', |
| 227 'services/view_manager/root_view_manager.cc', |
| 228 'services/view_manager/root_view_manager.h', |
| 223 'services/view_manager/view.cc', | 229 'services/view_manager/view.cc', |
| 224 'services/view_manager/view.h', | 230 'services/view_manager/view.h', |
| 225 'services/view_manager/view_manager.cc', | |
| 226 'services/view_manager/view_manager_connection.cc', | 231 'services/view_manager/view_manager_connection.cc', |
| 227 'services/view_manager/view_manager_connection.h', | 232 'services/view_manager/view_manager_connection.h', |
| 228 'services/view_manager/view_manager_export.h', | 233 'services/view_manager/view_manager_export.h', |
| 229 ], | 234 ], |
| 230 'defines': [ | 235 'defines': [ |
| 231 'MOJO_VIEW_MANAGER_IMPLEMENTATION', | 236 'MOJO_VIEW_MANAGER_IMPLEMENTATION', |
| 232 ], | 237 ], |
| 233 }, | 238 }, |
| 234 { | 239 { |
| 235 'target_name': 'mojo_view_manager_unittests', | 240 'target_name': 'mojo_view_manager_unittests', |
| 236 'type': 'executable', | 241 'type': 'executable', |
| 237 'dependencies': [ | 242 'dependencies': [ |
| 238 '../base/base.gyp:base', | 243 '../base/base.gyp:base', |
| 239 '../base/base.gyp:run_all_unittests', | 244 '../base/base.gyp:test_support_base', |
| 240 '../skia/skia.gyp:skia', | 245 '../skia/skia.gyp:skia', |
| 241 '../testing/gtest.gyp:gtest', | 246 '../testing/gtest.gyp:gtest', |
| 242 '../ui/aura/aura.gyp:aura', | 247 '../ui/aura/aura.gyp:aura', |
| 248 '../ui/gl/gl.gyp:gl', |
| 243 'mojo_environment_chromium', | 249 'mojo_environment_chromium', |
| 244 'mojo_shell_client', | 250 'mojo_shell_client', |
| 245 'mojo_shell_test_support', | 251 'mojo_shell_test_support', |
| 246 'mojo_system_impl', | 252 'mojo_system_impl', |
| 247 'mojo_view_manager_bindings', | 253 'mojo_view_manager_bindings', |
| 248 'mojo_view_manager_common', | 254 'mojo_view_manager_common', |
| 249 ], | 255 ], |
| 250 'sources': [ | 256 'sources': [ |
| 257 'services/view_manager/view_manager_test_suite.cc', |
| 258 'services/view_manager/view_manager_test_suite.h', |
| 259 'services/view_manager/view_manager_unittests.cc', |
| 251 'services/view_manager/view_manager_connection_unittest.cc', | 260 'services/view_manager/view_manager_connection_unittest.cc', |
| 252 ], | 261 ], |
| 253 }, | 262 }, |
| 254 { | 263 { |
| 255 'target_name': 'package_mojo_view_manager', | 264 'target_name': 'package_mojo_view_manager', |
| 256 'variables': { | 265 'variables': { |
| 257 'app_name': 'mojo_view_manager', | 266 'app_name': 'mojo_view_manager', |
| 258 }, | 267 }, |
| 259 'includes': [ 'build/package_app.gypi' ], | 268 'includes': [ 'build/package_app.gypi' ], |
| 260 }, | 269 }, |
| (...skipping 16 matching lines...) Expand all Loading... |
| 277 'mojo_system_impl', | 286 'mojo_system_impl', |
| 278 ], | 287 ], |
| 279 'sources': [ | 288 'sources': [ |
| 280 'services/dbus_echo/dbus_echo_service.cc', | 289 'services/dbus_echo/dbus_echo_service.cc', |
| 281 ], | 290 ], |
| 282 }, | 291 }, |
| 283 ], | 292 ], |
| 284 }], | 293 }], |
| 285 ], | 294 ], |
| 286 } | 295 } |
| OLD | NEW |