| 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 'services/native_viewport/native_viewport.mojom', | 65 'services/native_viewport/native_viewport.mojom', |
| 66 ], | 66 ], |
| 67 'variables': { | 67 'variables': { |
| 68 'mojom_base_output_dir': 'mojo', | 68 'mojom_base_output_dir': 'mojo', |
| 69 }, | 69 }, |
| 70 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], | 70 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], |
| 71 'export_dependent_settings': [ | 71 'export_dependent_settings': [ |
| 72 'mojo_cpp_bindings', | 72 'mojo_cpp_bindings', |
| 73 ], | 73 ], |
| 74 'dependencies': [ | 74 'dependencies': [ |
| 75 'mojo_geometry_bindings', |
| 75 'mojo_cpp_bindings', | 76 'mojo_cpp_bindings', |
| 76 ], | 77 ], |
| 77 }, | 78 }, |
| 78 { | 79 { |
| 79 'target_name': 'mojo_native_viewport_service', | 80 'target_name': 'mojo_native_viewport_service', |
| 80 # This is linked directly into the embedder, so we make it a component. | 81 # This is linked directly into the embedder, so we make it a component. |
| 81 'type': '<(component)', | 82 'type': '<(component)', |
| 82 'dependencies': [ | 83 'dependencies': [ |
| 83 '../base/base.gyp:base', | 84 '../base/base.gyp:base', |
| 84 '../ui/events/events.gyp:events', | 85 '../ui/events/events.gyp:events', |
| 85 '../ui/gfx/gfx.gyp:gfx', | 86 '../ui/gfx/gfx.gyp:gfx', |
| 86 '../ui/gfx/gfx.gyp:gfx_geometry', | 87 '../ui/gfx/gfx.gyp:gfx_geometry', |
| 87 'mojo_common_lib', | 88 'mojo_common_lib', |
| 88 'mojo_environment_chromium', | 89 'mojo_environment_chromium', |
| 90 'mojo_geometry_bindings', |
| 91 'mojo_geometry_lib', |
| 89 'mojo_gles2_service', | 92 'mojo_gles2_service', |
| 90 'mojo_native_viewport_bindings', | 93 'mojo_native_viewport_bindings', |
| 91 'mojo_shell_client', | 94 'mojo_shell_client', |
| 92 'mojo_system_impl', | 95 'mojo_system_impl', |
| 93 ], | 96 ], |
| 94 'defines': [ | 97 'defines': [ |
| 95 'MOJO_NATIVE_VIEWPORT_IMPLEMENTATION', | 98 'MOJO_NATIVE_VIEWPORT_IMPLEMENTATION', |
| 96 ], | 99 ], |
| 97 'sources': [ | 100 'sources': [ |
| 98 'services/native_viewport/geometry_conversions.h', | |
| 99 'services/native_viewport/native_viewport.h', | 101 'services/native_viewport/native_viewport.h', |
| 100 'services/native_viewport/native_viewport_android.cc', | 102 'services/native_viewport/native_viewport_android.cc', |
| 101 'services/native_viewport/native_viewport_mac.mm', | 103 'services/native_viewport/native_viewport_mac.mm', |
| 102 'services/native_viewport/native_viewport_service.cc', | 104 'services/native_viewport/native_viewport_service.cc', |
| 103 'services/native_viewport/native_viewport_service.h', | 105 'services/native_viewport/native_viewport_service.h', |
| 104 'services/native_viewport/native_viewport_stub.cc', | 106 'services/native_viewport/native_viewport_stub.cc', |
| 105 'services/native_viewport/native_viewport_win.cc', | 107 'services/native_viewport/native_viewport_win.cc', |
| 106 'services/native_viewport/native_viewport_x11.cc', | 108 'services/native_viewport/native_viewport_x11.cc', |
| 107 ], | 109 ], |
| 108 'conditions': [ | 110 'conditions': [ |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 'dependencies': [ | 216 'dependencies': [ |
| 215 '../base/base.gyp:base', | 217 '../base/base.gyp:base', |
| 216 '../skia/skia.gyp:skia', | 218 '../skia/skia.gyp:skia', |
| 217 '../ui/aura/aura.gyp:aura', | 219 '../ui/aura/aura.gyp:aura', |
| 218 '../ui/base/ui_base.gyp:ui_base', | 220 '../ui/base/ui_base.gyp:ui_base', |
| 219 '../ui/gfx/gfx.gyp:gfx', | 221 '../ui/gfx/gfx.gyp:gfx', |
| 220 '../ui/gfx/gfx.gyp:gfx_geometry', | 222 '../ui/gfx/gfx.gyp:gfx_geometry', |
| 221 'mojo_aura_support', | 223 'mojo_aura_support', |
| 222 'mojo_common_lib', | 224 'mojo_common_lib', |
| 223 'mojo_environment_chromium', | 225 'mojo_environment_chromium', |
| 226 'mojo_geometry_bindings', |
| 227 'mojo_geometry_lib', |
| 224 'mojo_gles2', | 228 'mojo_gles2', |
| 225 'mojo_launcher_bindings', | 229 'mojo_launcher_bindings', |
| 226 'mojo_native_viewport_bindings', | 230 'mojo_native_viewport_bindings', |
| 227 'mojo_shell_client', | 231 'mojo_shell_client', |
| 228 'mojo_system_impl', | 232 'mojo_system_impl', |
| 229 'mojo_view_manager_bindings', | 233 'mojo_view_manager_bindings', |
| 230 'mojo_view_manager_common', | 234 'mojo_view_manager_common', |
| 231 ], | 235 ], |
| 232 'sources': [ | 236 'sources': [ |
| 233 'services/view_manager/ids.h', | 237 'services/view_manager/ids.h', |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 'mojo_system_impl', | 315 'mojo_system_impl', |
| 312 ], | 316 ], |
| 313 'sources': [ | 317 'sources': [ |
| 314 'services/dbus_echo/dbus_echo_service.cc', | 318 'services/dbus_echo/dbus_echo_service.cc', |
| 315 ], | 319 ], |
| 316 }, | 320 }, |
| 317 ], | 321 ], |
| 318 }], | 322 }], |
| 319 ], | 323 ], |
| 320 } | 324 } |
| OLD | NEW |