| 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 ], | 135 ], |
| 136 'variables': { | 136 'variables': { |
| 137 'mojom_base_output_dir': 'mojo', | 137 'mojom_base_output_dir': 'mojo', |
| 138 }, | 138 }, |
| 139 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], | 139 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], |
| 140 'export_dependent_settings': [ | 140 'export_dependent_settings': [ |
| 141 'mojo_cpp_bindings', | 141 'mojo_cpp_bindings', |
| 142 ], | 142 ], |
| 143 'dependencies': [ | 143 'dependencies': [ |
| 144 'mojo_cpp_bindings', | 144 'mojo_cpp_bindings', |
| 145 'mojo_geometry_bindings', |
| 145 ], | 146 ], |
| 146 }, | 147 }, |
| 147 { | 148 { |
| 148 'target_name': 'mojo_view_manager_lib', | 149 'target_name': 'mojo_view_manager_lib', |
| 149 'type': 'static_library', | 150 'type': 'static_library', |
| 150 'dependencies': [ | 151 'dependencies': [ |
| 151 '../base/base.gyp:base', | 152 '../base/base.gyp:base', |
| 153 '../ui/gfx/gfx.gyp:gfx_geometry', |
| 154 'mojo_geometry_bindings', |
| 155 'mojo_geometry_lib', |
| 152 'mojo_shell_bindings', | 156 'mojo_shell_bindings', |
| 153 'mojo_view_manager_bindings', | 157 'mojo_view_manager_bindings', |
| 154 'mojo_view_manager_common', | 158 'mojo_view_manager_common', |
| 155 ], | 159 ], |
| 156 'sources': [ | 160 'sources': [ |
| 157 'services/public/cpp/view_manager/lib/view.cc', | 161 'services/public/cpp/view_manager/lib/view.cc', |
| 158 'services/public/cpp/view_manager/lib/view_private.cc', | 162 'services/public/cpp/view_manager/lib/view_private.cc', |
| 159 'services/public/cpp/view_manager/lib/view_private.h', | 163 'services/public/cpp/view_manager/lib/view_private.h', |
| 160 'services/public/cpp/view_manager/lib/view_manager.cc', | 164 'services/public/cpp/view_manager/lib/view_manager.cc', |
| 161 'services/public/cpp/view_manager/lib/view_manager_private.cc', | 165 'services/public/cpp/view_manager/lib/view_manager_private.cc', |
| (...skipping 15 matching lines...) Expand all Loading... |
| 177 ], | 181 ], |
| 178 }, | 182 }, |
| 179 { | 183 { |
| 180 'target_name': 'mojo_view_manager_lib_unittests', | 184 'target_name': 'mojo_view_manager_lib_unittests', |
| 181 'type': 'executable', | 185 'type': 'executable', |
| 182 'dependencies': [ | 186 'dependencies': [ |
| 183 '../base/base.gyp:base', | 187 '../base/base.gyp:base', |
| 184 '../base/base.gyp:test_support_base', | 188 '../base/base.gyp:test_support_base', |
| 185 '../testing/gtest.gyp:gtest', | 189 '../testing/gtest.gyp:gtest', |
| 186 'mojo_environment_chromium', | 190 'mojo_environment_chromium', |
| 191 'mojo_geometry_bindings', |
| 192 'mojo_geometry_lib', |
| 187 'mojo_shell_test_support', | 193 'mojo_shell_test_support', |
| 188 'mojo_view_manager_bindings', | 194 'mojo_view_manager_bindings', |
| 189 'mojo_view_manager_lib', | 195 'mojo_view_manager_lib', |
| 190 ], | 196 ], |
| 191 'sources': [ | 197 'sources': [ |
| 192 'services/public/cpp/view_manager/tests/view_unittest.cc', | 198 'services/public/cpp/view_manager/tests/view_unittest.cc', |
| 193 'services/public/cpp/view_manager/tests/view_manager_unittest.cc', | 199 'services/public/cpp/view_manager/tests/view_manager_unittest.cc', |
| 194 'services/public/cpp/view_manager/tests/view_tree_host_unittest.cc', | 200 'services/public/cpp/view_manager/tests/view_tree_host_unittest.cc', |
| 195 'services/public/cpp/view_manager/tests/view_tree_node_unittest.cc', | 201 'services/public/cpp/view_manager/tests/view_tree_node_unittest.cc', |
| 196 ], | 202 ], |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 }, | 275 }, |
| 270 { | 276 { |
| 271 'target_name': 'mojo_view_manager_unittests', | 277 'target_name': 'mojo_view_manager_unittests', |
| 272 'type': 'executable', | 278 'type': 'executable', |
| 273 'dependencies': [ | 279 'dependencies': [ |
| 274 '../base/base.gyp:base', | 280 '../base/base.gyp:base', |
| 275 '../base/base.gyp:test_support_base', | 281 '../base/base.gyp:test_support_base', |
| 276 '../skia/skia.gyp:skia', | 282 '../skia/skia.gyp:skia', |
| 277 '../testing/gtest.gyp:gtest', | 283 '../testing/gtest.gyp:gtest', |
| 278 '../ui/aura/aura.gyp:aura', | 284 '../ui/aura/aura.gyp:aura', |
| 285 '../ui/gfx/gfx.gyp:gfx_geometry', |
| 279 '../ui/gl/gl.gyp:gl', | 286 '../ui/gl/gl.gyp:gl', |
| 280 'mojo_environment_chromium', | 287 'mojo_environment_chromium', |
| 288 'mojo_geometry_bindings', |
| 289 'mojo_geometry_lib', |
| 281 'mojo_shell_client', | 290 'mojo_shell_client', |
| 282 'mojo_shell_test_support', | 291 'mojo_shell_test_support', |
| 283 'mojo_system_impl', | 292 'mojo_system_impl', |
| 284 'mojo_view_manager_bindings', | 293 'mojo_view_manager_bindings', |
| 285 'mojo_view_manager_common', | 294 'mojo_view_manager_common', |
| 286 'mojo_view_manager_run_unittests', | 295 'mojo_view_manager_run_unittests', |
| 287 ], | 296 ], |
| 288 'sources': [ | 297 'sources': [ |
| 289 'services/view_manager/view_manager_connection_unittest.cc', | 298 'services/view_manager/view_manager_connection_unittest.cc', |
| 290 ], | 299 ], |
| (...skipping 24 matching lines...) Expand all Loading... |
| 315 'mojo_system_impl', | 324 'mojo_system_impl', |
| 316 ], | 325 ], |
| 317 'sources': [ | 326 'sources': [ |
| 318 'services/dbus_echo/dbus_echo_service.cc', | 327 'services/dbus_echo/dbus_echo_service.cc', |
| 319 ], | 328 ], |
| 320 }, | 329 }, |
| 321 ], | 330 ], |
| 322 }], | 331 }], |
| 323 ], | 332 ], |
| 324 } | 333 } |
| OLD | NEW |