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

Side by Side Diff: mojo/mojo_services.gypi

Issue 231353002: Make mojo_system static and mojo_system_impl a component, never use both (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the mac loader path dependencies Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « mojo/mojo_public.gypi ('k') | mojo/public/platform/native/system_thunks.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'targets': [ 2 'targets': [
3 { 3 {
4 'target_name': 'mojo_gles2_bindings', 4 'target_name': 'mojo_gles2_bindings',
5 'type': 'static_library', 5 'type': 'static_library',
6 'sources': [ 6 'sources': [
7 'services/gles2/command_buffer.mojom', 7 'services/gles2/command_buffer.mojom',
8 'services/gles2/command_buffer_type_conversions.cc', 8 'services/gles2/command_buffer_type_conversions.cc',
9 'services/gles2/command_buffer_type_conversions.h', 9 'services/gles2/command_buffer_type_conversions.h',
10 'services/gles2/mojo_buffer_backing.cc', 10 'services/gles2/mojo_buffer_backing.cc',
11 'services/gles2/mojo_buffer_backing.h', 11 'services/gles2/mojo_buffer_backing.h',
12 ], 12 ],
13 'variables': { 13 'variables': {
14 'mojom_base_output_dir': 'mojo', 14 'mojom_base_output_dir': 'mojo',
15 }, 15 },
16 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], 16 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
17 'export_dependent_settings': [ 17 'export_dependent_settings': [
18 'mojo_bindings', 18 'mojo_bindings',
19 'mojo_system',
20 ], 19 ],
21 'dependencies': [ 20 'dependencies': [
22 '../gpu/gpu.gyp:command_buffer_common', 21 '../gpu/gpu.gyp:command_buffer_common',
23 'mojo_bindings', 22 'mojo_bindings',
24 'mojo_system',
25 ], 23 ],
26 }, 24 },
27 { 25 {
28 'target_name': 'mojo_gles2_service', 26 'target_name': 'mojo_gles2_service',
29 'type': 'static_library', 27 'type': 'static_library',
30 'dependencies': [ 28 'dependencies': [
31 '../base/base.gyp:base', 29 '../base/base.gyp:base',
32 '../gpu/gpu.gyp:command_buffer_service', 30 '../gpu/gpu.gyp:command_buffer_service',
33 '../ui/gfx/gfx.gyp:gfx', 31 '../ui/gfx/gfx.gyp:gfx',
34 '../ui/gfx/gfx.gyp:gfx_geometry', 32 '../ui/gfx/gfx.gyp:gfx_geometry',
(...skipping 13 matching lines...) Expand all
48 'type': 'static_library', 46 'type': 'static_library',
49 'sources': [ 47 'sources': [
50 'services/native_viewport/native_viewport.mojom', 48 'services/native_viewport/native_viewport.mojom',
51 ], 49 ],
52 'variables': { 50 'variables': {
53 'mojom_base_output_dir': 'mojo', 51 'mojom_base_output_dir': 'mojo',
54 }, 52 },
55 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], 53 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
56 'export_dependent_settings': [ 54 'export_dependent_settings': [
57 'mojo_bindings', 55 'mojo_bindings',
58 'mojo_system',
59 ], 56 ],
60 'dependencies': [ 57 'dependencies': [
61 'mojo_bindings', 58 'mojo_bindings',
62 'mojo_system',
63 ], 59 ],
64 }, 60 },
65 { 61 {
66 'target_name': 'mojo_native_viewport_service', 62 'target_name': 'mojo_native_viewport_service',
67 'type': '<(component)', 63 'type': 'shared_library',
68 'dependencies': [ 64 'dependencies': [
69 '../base/base.gyp:base', 65 '../base/base.gyp:base',
70 '../ui/events/events.gyp:events', 66 '../ui/events/events.gyp:events',
71 '../ui/gfx/gfx.gyp:gfx', 67 '../ui/gfx/gfx.gyp:gfx',
72 '../ui/gfx/gfx.gyp:gfx_geometry', 68 '../ui/gfx/gfx.gyp:gfx_geometry',
73 'mojo_common_lib', 69 'mojo_common_lib',
74 'mojo_environment_chromium', 70 'mojo_environment_chromium',
75 'mojo_gles2_service', 71 'mojo_gles2_service',
76 'mojo_native_viewport_bindings', 72 'mojo_native_viewport_bindings',
77 'mojo_shell_client', 73 'mojo_shell_client',
74 'mojo_system_impl',
78 ], 75 ],
79 'defines': [ 76 'defines': [
80 'MOJO_NATIVE_VIEWPORT_IMPLEMENTATION', 77 'MOJO_NATIVE_VIEWPORT_IMPLEMENTATION',
81 ], 78 ],
82 'sources': [ 79 'sources': [
83 'services/native_viewport/geometry_conversions.h', 80 'services/native_viewport/geometry_conversions.h',
84 'services/native_viewport/native_viewport.h', 81 'services/native_viewport/native_viewport.h',
85 'services/native_viewport/native_viewport_android.cc', 82 'services/native_viewport/native_viewport_android.cc',
86 'services/native_viewport/native_viewport_mac.mm', 83 'services/native_viewport/native_viewport_mac.mm',
87 'services/native_viewport/native_viewport_service.cc', 84 'services/native_viewport/native_viewport_service.cc',
(...skipping 10 matching lines...) Expand all
98 }], 95 }],
99 ['OS=="android"', { 96 ['OS=="android"', {
100 'dependencies': [ 97 'dependencies': [
101 'mojo_jni_headers', 98 'mojo_jni_headers',
102 ], 99 ],
103 }], 100 }],
104 ], 101 ],
105 }, 102 },
106 ], 103 ],
107 } 104 }
OLDNEW
« no previous file with comments | « mojo/mojo_public.gypi ('k') | mojo/public/platform/native/system_thunks.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698