Chromium Code Reviews| Index: gyp/skmojo.gyp |
| diff --git a/gyp/skmojo.gyp b/gyp/skmojo.gyp |
| index 63385cd2fa79d14df466e648f0654295f0203e75..1a25fdd84f7457e8cb7ac7189819c99b98be703c 100644 |
| --- a/gyp/skmojo.gyp |
| +++ b/gyp/skmojo.gyp |
| @@ -10,9 +10,18 @@ |
| 'variables': { 'mojo_parent_dir': '../third_party/externals' }, |
| 'include_dirs': [ '<(mojo_parent_dir)' ], |
| 'all_dependent_settings': { 'include_dirs': [ '<(mojo_parent_dir)' ] }, |
| + 'xcode_settings': { 'OTHER_CFLAGS': [ '-Wno-missing-field-initializers' ], }, |
|
mtklein
2016/02/03 20:59:34
Let's just turn all warnings off?
hal.canary
2016/02/03 21:23:42
done ( '-w' )
|
| 'sources': [ |
| '<!@(python find.py <(mojo_parent_dir)/mojo/public/cpp "*.cc")', |
| '<(mojo_parent_dir)/mojo/public/platform/native/system_thunks.c', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/application/application.mojom.cc', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/application/application.mojom.h', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/application/service_provider.mojom.cc', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/application/service_provider.mojom.h', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/bindings/interface_control_messages.mojom.cc', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/bindings/interface_control_messages.mojom.h', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/bindings/tests/ping_service.mojom.cc', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/bindings/tests/ping_service.mojom.h', |
| ], |
| 'sources!': [ |
| '<!@(python find.py <(mojo_parent_dir)/mojo/public/cpp "*_unittest.cc")', |
| @@ -21,7 +30,32 @@ |
| '<!@(python find.py <(mojo_parent_dir)/mojo/public/cpp "*_test_*.cc")', |
| '<!@(python find.py <(mojo_parent_dir)/mojo/public/cpp "*_win.cc")', |
| ], |
| - }, |
| + 'actions':[ |
| + { |
| + 'action_name': 'generate_from_mojoms', |
| + 'inputs': [ |
| + '../experimental/mojo/generate.py', |
| + '<(mojo_parent_dir)/mojo/public/tools/bindings/mojom_parser/bin/linux64/mojom_parser.sha1', |
| + '<(mojo_parent_dir)/mojo/public/tools/bindings/mojom_parser/bin/mac64/mojom_parser.sha1', |
| + '<(mojo_parent_dir)/mojo/public/tools/bindings/mojom_bindings_generator.py', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/bindings/interface_control_messages.mojom', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/application/service_provider.mojom', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/bindings/tests/ping_service.mojom', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/application/application.mojom', |
| + ], |
| + 'outputs': [ |
| + '<(mojo_parent_dir)/mojo/public/interfaces/application/application.mojom.cc', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/application/application.mojom.h', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/application/service_provider.mojom.cc', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/application/service_provider.mojom.h', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/bindings/interface_control_messages.mojom.cc', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/bindings/interface_control_messages.mojom.h', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/bindings/tests/ping_service.mojom.cc', |
| + '<(mojo_parent_dir)/mojo/public/interfaces/bindings/tests/ping_service.mojom.h', |
| + ], |
| + 'action': ['python', '../experimental/mojo/generate.py'] |
| + }, |
| + ], }, |
| { |
| 'target_name': 'skmojo', |
| 'type': 'static_library', |
| @@ -42,16 +76,12 @@ |
| 'inputs': [ |
| '../experimental/mojo/generate.py', |
| '../experimental/mojo/SkMojo.mojom', |
| - '<(mojo_dir)/tools/bindings/mojom_parser/bin/linux64/mojom_parser.sha1', |
| - '<(mojo_dir)/tools/bindings/mojom_bindings_generator.py', |
| - '<(mojo_dir)/interfaces/bindings/interface_control_messages.mojom', |
| - '<(mojo_dir)/interfaces/application/service_provider.mojom', |
| - '<(mojo_dir)/interfaces/bindings/tests/ping_service.mojom', |
| - '<(mojo_dir)/interfaces/application/application.mojom', |
| ], |
| - 'outputs': ['../experimental/mojo/SkMojo.mojom.h', |
| - '../experimental/mojo/SkMojo.mojom.cc'], |
| - 'action': ['python', '../experimental/mojo/generate.py'] |
| + 'outputs': [ |
| + '../experimental/mojo/SkMojo.mojom.h', |
| + '../experimental/mojo/SkMojo.mojom.cc' |
| + ], |
| + 'action': ['python', '../experimental/mojo/generate.py', '../experimental/mojo/SkMojo.mojom'] |
| }, |
| ], |
| }, |