diff options
| author |  halcanary <halcanary@google.com> | 2016-02-03 13:54:03 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-03 13:54:03 -0800 |
| commit | 72002f28d5dc5c52df47393280154d3b446b7107 (patch) | |
| tree | 7fd78f54d94aadccebeb4d105ba2de7454493e86 /gyp | |
| parent | e62cbdffcf27278272e87de65a07dddc24605ad7 (diff) | |
SkMojo: generate on Darwin/x86_64
also clean up generate and skmojo.gyp to work right.
BUG=skia:4891
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1660043004
Review URL: https://codereview.chromium.org/1660043004
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/skmojo.gyp | 50 |
1 files changed, 40 insertions, 10 deletions
diff --git a/gyp/skmojo.gyp b/gyp/skmojo.gyp index 63385cd2fa..0bd6f2c156 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': [ '-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'] }, ], }, |