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

Side by Side Diff: mojo/mojo_services.gypi

Issue 93793009: Implement ServiceManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Accidental inclusion of adb_run change Created 7 years 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
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/gles2.mojom', 7 'services/gles2/gles2.mojom',
8 ], 8 ],
9 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ], 9 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
10 'export_dependent_settings': [ 10 'export_dependent_settings': [
(...skipping 27 matching lines...) Expand all
38 'services/native_viewport/native_viewport.mojom', 38 'services/native_viewport/native_viewport.mojom',
39 ], 39 ],
40 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ], 40 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
41 'export_dependent_settings': [ 41 'export_dependent_settings': [
42 'mojo_bindings', 42 'mojo_bindings',
43 'mojo_system', 43 'mojo_system',
44 ], 44 ],
45 }, 45 },
46 { 46 {
47 'target_name': 'mojo_native_viewport_service', 47 'target_name': 'mojo_native_viewport_service',
48 'type': 'static_library', 48 'type': 'static_library',
abarth-chromium 2013/12/15 22:54:10 I'm a bit confused. You've marked this target as
DaveMoore 2013/12/16 17:40:22 Changed to shared_library (A little confused as to
49 'dependencies': [ 49 'dependencies': [
50 '../base/base.gyp:base', 50 '../base/base.gyp:base',
51 '../ui/events/events.gyp:events', 51 '../ui/events/events.gyp:events',
52 '../ui/gfx/gfx.gyp:gfx', 52 '../ui/gfx/gfx.gyp:gfx',
53 'mojo_gles2_service', 53 'mojo_gles2_service',
54 'mojo_native_viewport_bindings', 54 'mojo_native_viewport_bindings',
55 ], 55 'mojo_shell_bindings',
56 'export_dependent_settings': [
57 'mojo_native_viewport_bindings',
58 ], 56 ],
59 'sources': [ 57 'sources': [
60 'services/native_viewport/native_viewport.h', 58 'services/native_viewport/native_viewport.h',
61 'services/native_viewport/native_viewport_android.cc', 59 'services/native_viewport/native_viewport_android.cc',
62 'services/native_viewport/native_viewport_impl.cc',
63 'services/native_viewport/native_viewport_impl.h',
64 'services/native_viewport/native_viewport_mac.mm', 60 'services/native_viewport/native_viewport_mac.mm',
61 'services/native_viewport/native_viewport_service.cc',
62 'services/native_viewport/native_viewport_service.h',
65 'services/native_viewport/native_viewport_stub.cc', 63 'services/native_viewport/native_viewport_stub.cc',
66 'services/native_viewport/native_viewport_win.cc', 64 'services/native_viewport/native_viewport_win.cc',
67 'services/native_viewport/native_viewport_x11.cc', 65 'services/native_viewport/native_viewport_x11.cc',
68 ], 66 ],
69 'conditions': [ 67 'conditions': [
70 ['OS=="win" or OS=="android" or OS=="linux" or OS=="mac"', { 68 ['OS=="win" or OS=="android" or OS=="linux" or OS=="mac"', {
71 'sources!': [ 69 'sources!': [
72 'services/native_viewport/native_viewport_stub.cc', 70 'services/native_viewport/native_viewport_stub.cc',
73 ], 71 ],
74 }], 72 }],
75 ['OS=="android"', { 73 ['OS=="android"', {
76 'dependencies': [ 74 'dependencies': [
77 'mojo_jni_headers', 75 'mojo_jni_headers',
78 ], 76 ],
79 }], 77 }],
80 ], 78 ],
81 }, 79 },
82 ], 80 ],
83 } 81 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698