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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/mojo_services.gypi

Issue 640893003: Move mojo/services/public/cpp TypeConverters to mojo/converters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix GN. Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« mojo/converters/surfaces_utils.h ('K') | « mojo/mojo_examples.gypi ('k') | mojo/services/html_viewer/BUILD.gn » ('j') | mojo/services/window_manager/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index 5b2bd9cd816207104ac53c1f236d5a3d720e9bca..ad04f73e12bc1e5ac2cf4b2dfa1200c34a434f0d 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -165,10 +165,8 @@
'../ui/gfx/gfx.gyp:gfx_geometry',
'mojo_base.gyp:mojo_application_chromium',
'mojo_base.gyp:mojo_common_lib',
- 'mojo_geometry_lib',
+ 'mojo_converters',
'mojo_gles2_service',
- 'mojo_input_events_lib',
- 'mojo_surfaces_lib',
'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
'services/public/mojo_services_public.gyp:mojo_native_viewport_bindings',
@@ -300,8 +298,7 @@
'../ui/gfx/gfx.gyp:gfx_geometry',
'mojo_base.gyp:mojo_application_chromium',
'mojo_cc_support',
- 'mojo_geometry_lib',
- 'mojo_surfaces_lib',
+ 'mojo_converters',
'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
@@ -331,7 +328,7 @@
'../ui/gfx/gfx.gyp:gfx_test_support',
'mojo.gyp:mojo_shell_test_support',
'mojo_base.gyp:mojo_environment_chromium',
- 'mojo_geometry_lib',
+ 'mojo_converters',
'mojo_view_manager_lib',
'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
'services/public/mojo_services_public.gyp:mojo_view_manager_bindings',
@@ -361,7 +358,7 @@
'../ui/gfx/gfx.gyp:gfx_geometry',
'mojo_application_manager',
'mojo_base.gyp:mojo_application_chromium',
- 'mojo_geometry_lib',
+ 'mojo_converters',
'public/mojo_public.gyp:mojo_application_base',
'public/mojo_public.gyp:mojo_application_bindings',
'public/mojo_public.gyp:mojo_cpp_bindings',
@@ -457,138 +454,6 @@
'services/test_service/test_request_tracker_impl.h',
],
},
- {
- # GN version: //mojo/services/public/cpp/input_events
- 'target_name': 'mojo_input_events_lib',
- 'type': '<(component)',
- 'defines': [
- 'MOJO_INPUT_EVENTS_IMPLEMENTATION',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- '../ui/events/events.gyp:events',
- '../ui/gfx/gfx.gyp:gfx_geometry',
- 'mojo_geometry_lib',
- 'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
- 'services/public/mojo_services_public.gyp:mojo_input_events_bindings',
- '<(mojo_system_for_component)',
- ],
- 'sources': [
- 'services/public/cpp/input_events/lib/input_events_type_converters.cc',
- 'services/public/cpp/input_events/lib/mojo_extended_key_event_data.cc',
- 'services/public/cpp/input_events/lib/mojo_extended_key_event_data.h',
- 'services/public/cpp/input_events/input_events_type_converters.h',
- 'services/public/cpp/input_events/mojo_input_events_export.h',
- ],
- 'conditions': [
- ['component=="shared_library"', {
- 'dependencies': [
- 'mojo_base.gyp:mojo_environment_chromium',
- ],
- }],
- ],
- },
- {
- # GN version: //mojo/services/public/cpp/geometry
- 'target_name': 'mojo_geometry_lib',
- 'type': '<(component)',
- 'defines': [
- 'MOJO_GEOMETRY_IMPLEMENTATION',
- ],
- 'dependencies': [
- '../skia/skia.gyp:skia',
- '../ui/gfx/gfx.gyp:gfx',
- '../ui/gfx/gfx.gyp:gfx_geometry',
- 'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
- '<(mojo_system_for_component)',
- ],
- 'export_dependent_settings': [
- '../ui/gfx/gfx.gyp:gfx',
- ],
- 'sources': [
- 'services/public/cpp/geometry/lib/geometry_type_converters.cc',
- 'services/public/cpp/geometry/geometry_type_converters.h',
- 'services/public/cpp/geometry/mojo_geometry_export.h',
- ],
- 'conditions': [
- ['component=="shared_library"', {
- 'dependencies': [
- 'mojo_base.gyp:mojo_environment_chromium',
- ],
- }],
- ],
- },
- {
- # GN version: //mojo/services/public/cpp/surfaces
- 'target_name': 'mojo_surfaces_lib',
- 'type': '<(component)',
- 'defines': [
- 'MOJO_SURFACES_IMPLEMENTATION',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- '../cc/cc.gyp:cc',
- '../cc/cc.gyp:cc_surfaces',
- '../skia/skia.gyp:skia',
- '../gpu/gpu.gyp:gpu',
- '../ui/gfx/gfx.gyp:gfx',
- '../ui/gfx/gfx.gyp:gfx_geometry',
- 'mojo_geometry_lib',
- 'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
- 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
- '<(mojo_system_for_component)',
- ],
- 'export_dependent_settings': [
- 'mojo_geometry_lib',
- 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
- ],
- 'sources': [
- 'services/public/cpp/surfaces/lib/surfaces_type_converters.cc',
- 'services/public/cpp/surfaces/lib/surfaces_utils.cc',
- 'services/public/cpp/surfaces/surfaces_type_converters.h',
- 'services/public/cpp/surfaces/surfaces_utils.h',
- 'services/public/cpp/surfaces/mojo_surfaces_export.h',
- ],
- 'conditions': [
- ['component=="shared_library"', {
- 'dependencies': [
- 'mojo_base.gyp:mojo_environment_chromium',
- ],
- }],
- ],
- },
- {
- # GN version: //mojo/services/public/cpp/surfaces/tests
- 'target_name': 'mojo_surfaces_lib_unittests',
- 'type': 'executable',
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/base.gyp:test_support_base',
- '../cc/cc.gyp:cc',
- '../cc/cc.gyp:cc_surfaces',
- '../gpu/gpu.gyp:gpu',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
- '../ui/gfx/gfx.gyp:gfx',
- '../ui/gfx/gfx.gyp:gfx_geometry',
- '../ui/gfx/gfx.gyp:gfx_test_support',
- 'edk/mojo_edk.gyp:mojo_run_all_unittests',
- 'mojo_base.gyp:mojo_environment_chromium',
- 'mojo_geometry_lib',
- 'mojo_surfaces_lib',
- 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
- ],
- 'sources': [
- 'services/public/cpp/surfaces/tests/surface_unittest.cc',
- ],
- 'conditions': [
- ['component=="shared_library"', {
- 'dependencies': [
- 'mojo_base.gyp:mojo_environment_chromium',
- ],
- }],
- ],
- },
],
'conditions': [
['use_aura==1', {
@@ -609,9 +474,7 @@
'mojo_base.gyp:mojo_application_chromium',
'mojo_base.gyp:mojo_common_lib',
'mojo_base.gyp:mojo_common_lib',
- 'mojo_geometry_lib',
- 'mojo_input_events_lib',
- 'mojo_surfaces_lib',
+ 'mojo_converters',
'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
@@ -667,8 +530,7 @@
'edk/mojo_edk.gyp:mojo_system_impl',
'mojo_application_manager',
'mojo_base.gyp:mojo_application_chromium',
- 'mojo_geometry_lib',
- 'mojo_input_events_lib',
+ 'mojo_converters',
'mojo_shell_test_support',
'mojo_view_manager_run_unittests',
'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
@@ -713,7 +575,7 @@
'mojo_aura_support',
'mojo_base.gyp:mojo_application_chromium',
'mojo_base.gyp:mojo_common_lib',
- 'mojo_input_events_lib',
+ 'mojo_converters',
'mojo_view_manager_lib',
'services/public/mojo_services_public.gyp:mojo_core_window_manager_bindings',
],
« mojo/converters/surfaces_utils.h ('K') | « mojo/mojo_examples.gypi ('k') | mojo/services/html_viewer/BUILD.gn » ('j') | mojo/services/window_manager/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698