Index: mojo/mojo_services_public.gyp |
diff --git a/mojo/services/public/mojo_services_public.gyp b/mojo/mojo_services_public.gyp |
similarity index 53% |
rename from mojo/services/public/mojo_services_public.gyp |
rename to mojo/mojo_services_public.gyp |
index 55673c72b858d4fde4ff8bb5254fc3f268d454fe..9846586d8f0ab7f4dd9bc8594d5dc227c669d3bc 100644 |
--- a/mojo/services/public/mojo_services_public.gyp |
+++ b/mojo/mojo_services_public.gyp |
@@ -4,7 +4,7 @@ |
{ |
'includes': [ |
- '../../mojo_variables.gypi', |
+ 'mojo_variables.gypi', |
], |
'targets': [ |
{ |
@@ -31,14 +31,14 @@ |
'target_name': 'mojo_clipboard_bindings', |
'type': 'static_library', |
'sources': [ |
- '../clipboard/public/interfaces/clipboard.mojom', |
+ 'services/clipboard/public/interfaces/clipboard.mojom', |
], |
- 'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ], |
+ 'includes': [ 'mojom_bindings_generator.gypi' ], |
'dependencies': [ |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
'export_dependent_settings': [ |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
}, |
{ |
@@ -46,18 +46,18 @@ |
'target_name': 'mojo_input_events_bindings', |
'type': 'static_library', |
'sources': [ |
- '../input_events/public/interfaces/input_event_constants.mojom', |
- '../input_events/public/interfaces/input_events.mojom', |
- '../input_events/public/interfaces/input_key_codes.mojom', |
+ 'services/input_events/public/interfaces/input_event_constants.mojom', |
+ 'services/input_events/public/interfaces/input_events.mojom', |
+ 'services/input_events/public/interfaces/input_key_codes.mojom', |
], |
- 'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ], |
+ 'includes': [ 'mojom_bindings_generator.gypi' ], |
'dependencies': [ |
'mojo_geometry_bindings', |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
'export_dependent_settings': [ |
'mojo_geometry_bindings', |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
}, |
{ |
@@ -65,14 +65,14 @@ |
'target_name': 'mojo_geometry_bindings', |
'type': 'static_library', |
'sources': [ |
- '../geometry/public/interfaces/geometry.mojom', |
+ 'services/geometry/public/interfaces/geometry.mojom', |
], |
- 'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ], |
+ 'includes': [ 'mojom_bindings_generator.gypi' ], |
'dependencies': [ |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
'export_dependent_settings': [ |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
}, |
{ |
@@ -80,19 +80,19 @@ |
'target_name': 'mojo_gpu_bindings', |
'type': 'static_library', |
'sources': [ |
- '../gpu/public/interfaces/command_buffer.mojom', |
- '../gpu/public/interfaces/gpu.mojom', |
- '../gpu/public/interfaces/gpu_capabilities.mojom', |
- '../gpu/public/interfaces/viewport_parameter_listener.mojom', |
+ 'services/gpu/public/interfaces/command_buffer.mojom', |
+ 'services/gpu/public/interfaces/gpu.mojom', |
+ 'services/gpu/public/interfaces/gpu_capabilities.mojom', |
+ 'services/gpu/public/interfaces/viewport_parameter_listener.mojom', |
], |
- 'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ], |
+ 'includes': [ 'mojom_bindings_generator.gypi' ], |
'dependencies': [ |
'mojo_geometry_bindings', |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
'export_dependent_settings': [ |
'mojo_geometry_bindings', |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
}, |
{ |
@@ -100,22 +100,22 @@ |
'target_name': 'mojo_native_viewport_bindings', |
'type': 'static_library', |
'sources': [ |
- '../native_viewport/public/interfaces/native_viewport.mojom', |
+ 'services/native_viewport/public/interfaces/native_viewport.mojom', |
], |
- 'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ], |
+ 'includes': [ 'mojom_bindings_generator.gypi' ], |
'dependencies': [ |
'mojo_geometry_bindings', |
'mojo_gpu_bindings', |
'mojo_input_events_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
'mojo_surface_id_bindings', |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
], |
'export_dependent_settings': [ |
'mojo_geometry_bindings', |
'mojo_gpu_bindings', |
'mojo_input_events_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
'mojo_surface_id_bindings', |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
], |
}, |
{ |
@@ -123,15 +123,15 @@ |
'target_name': 'mojo_navigation_bindings', |
'type': 'static_library', |
'sources': [ |
- '../navigation/public/interfaces/navigation.mojom', |
+ 'services/navigation/public/interfaces/navigation.mojom', |
], |
- 'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ], |
+ 'includes': [ 'mojom_bindings_generator.gypi' ], |
'export_dependent_settings': [ |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
'dependencies': [ |
'mojo_network_bindings', |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
}, |
{ |
@@ -139,16 +139,16 @@ |
'target_name': 'mojo_content_handler_bindings', |
'type': 'static_library', |
'sources': [ |
- '../content_handler/public/interfaces/content_handler.mojom', |
+ 'services/content_handler/public/interfaces/content_handler.mojom', |
], |
- 'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ], |
+ 'includes': [ 'mojom_bindings_generator.gypi' ], |
'export_dependent_settings': [ |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
'dependencies': [ |
'mojo_network_bindings', |
- '../../public/mojo_public.gyp:mojo_application_bindings', |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_application_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
}, |
{ |
@@ -156,23 +156,23 @@ |
'target_name': 'mojo_network_bindings', |
'type': 'static_library', |
'sources': [ |
- '../network/public/interfaces/cookie_store.mojom', |
- '../network/public/interfaces/net_address.mojom', |
- '../network/public/interfaces/network_error.mojom', |
- '../network/public/interfaces/network_service.mojom', |
- '../network/public/interfaces/tcp_bound_socket.mojom', |
- '../network/public/interfaces/tcp_connected_socket.mojom', |
- '../network/public/interfaces/tcp_server_socket.mojom', |
- '../network/public/interfaces/udp_socket.mojom', |
- '../network/public/interfaces/url_loader.mojom', |
- '../network/public/interfaces/web_socket.mojom', |
- ], |
- 'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ], |
+ 'services/network/public/interfaces/cookie_store.mojom', |
+ 'services/network/public/interfaces/net_address.mojom', |
+ 'services/network/public/interfaces/network_error.mojom', |
+ 'services/network/public/interfaces/network_service.mojom', |
+ 'services/network/public/interfaces/tcp_bound_socket.mojom', |
+ 'services/network/public/interfaces/tcp_connected_socket.mojom', |
+ 'services/network/public/interfaces/tcp_server_socket.mojom', |
+ 'services/network/public/interfaces/udp_socket.mojom', |
+ 'services/network/public/interfaces/url_loader.mojom', |
+ 'services/network/public/interfaces/web_socket.mojom', |
+ ], |
+ 'includes': [ 'mojom_bindings_generator.gypi' ], |
'export_dependent_settings': [ |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
'dependencies': [ |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
}, |
{ |
@@ -180,7 +180,7 @@ |
'target_name': 'mojo_view_manager_common', |
'type': 'static_library', |
'sources': [ |
- '../view_manager/public/cpp/types.h', |
+ 'services/view_manager/public/cpp/types.h', |
], |
}, |
{ |
@@ -188,23 +188,23 @@ |
'target_name': 'mojo_view_manager_bindings', |
'type': 'static_library', |
'sources': [ |
- '../view_manager/public/interfaces/view_manager.mojom', |
- '../view_manager/public/interfaces/view_manager_constants.mojom', |
+ 'services/view_manager/public/interfaces/view_manager.mojom', |
+ 'services/view_manager/public/interfaces/view_manager_constants.mojom', |
], |
- 'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ], |
+ 'includes': [ 'mojom_bindings_generator.gypi' ], |
'dependencies': [ |
'mojo_geometry_bindings', |
'mojo_input_events_bindings', |
+ 'mojo_public.gyp:mojo_application_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
'mojo_surface_id_bindings', |
- '../../public/mojo_public.gyp:mojo_application_bindings', |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
], |
'export_dependent_settings': [ |
'mojo_geometry_bindings', |
'mojo_input_events_bindings', |
+ 'mojo_public.gyp:mojo_application_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
'mojo_surface_id_bindings', |
- '../../public/mojo_public.gyp:mojo_application_bindings', |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
], |
}, |
{ |
@@ -212,21 +212,21 @@ |
'target_name': 'mojo_surfaces_bindings', |
'type': 'static_library', |
'sources': [ |
- '../surfaces/public/interfaces/surfaces.mojom', |
- '../surfaces/public/interfaces/surfaces_service.mojom', |
- '../surfaces/public/interfaces/quads.mojom', |
+ 'services/surfaces/public/interfaces/surfaces.mojom', |
+ 'services/surfaces/public/interfaces/surfaces_service.mojom', |
+ 'services/surfaces/public/interfaces/quads.mojom', |
], |
- 'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ], |
+ 'includes': [ 'mojom_bindings_generator.gypi' ], |
'dependencies': [ |
'mojo_geometry_bindings', |
'mojo_gpu_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
'mojo_surface_id_bindings', |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
], |
'export_dependent_settings': [ |
'mojo_geometry_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
'mojo_surface_id_bindings', |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
], |
}, |
{ |
@@ -234,14 +234,14 @@ |
'target_name': 'mojo_surface_id_bindings', |
'type': 'static_library', |
'sources': [ |
- '../surfaces/public/interfaces/surface_id.mojom', |
+ 'services/surfaces/public/interfaces/surface_id.mojom', |
], |
- 'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ], |
+ 'includes': [ 'mojom_bindings_generator.gypi' ], |
'dependencies': [ |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
'export_dependent_settings': [ |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
}, |
{ |
@@ -249,18 +249,18 @@ |
'target_name': 'mojo_window_manager_bindings', |
'type': 'static_library', |
'sources': [ |
- '../window_manager/public/interfaces/window_manager.mojom', |
+ 'services/window_manager/public/interfaces/window_manager.mojom', |
], |
- 'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ], |
+ 'includes': [ 'mojom_bindings_generator.gypi' ], |
'dependencies': [ |
'mojo_input_events_bindings', |
- '../../public/mojo_public.gyp:mojo_application_bindings', |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_application_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
'export_dependent_settings': [ |
'mojo_input_events_bindings', |
- '../../public/mojo_public.gyp:mojo_application_bindings', |
- '../../public/mojo_public.gyp:mojo_cpp_bindings', |
+ 'mojo_public.gyp:mojo_application_bindings', |
+ 'mojo_public.gyp:mojo_cpp_bindings', |
], |
}, |
], |