Chromium Code Reviews| Index: ios/web/ios_web.gyp |
| diff --git a/ios/web/ios_web.gyp b/ios/web/ios_web.gyp |
| index 2882d8cfc44a9a434281b3569bdacaac7934ae8d..e6b5ad74d32ebf95aae18b9ebf332ba0296f85a9 100644 |
| --- a/ios/web/ios_web.gyp |
| +++ b/ios/web/ios_web.gyp |
| @@ -51,6 +51,9 @@ |
| '../../ios/net/ios_net.gyp:ios_net', |
| '../../ios/third_party/blink/blink_html_tokenizer.gyp:blink_html_tokenizer', |
| '../../net/net.gyp:net', |
| + '../../mojo/mojo_edk.gyp:mojo_system_impl', |
| + '../../mojo/mojo_public.gyp:mojo_public', |
| + '../../services/shell/shell.gyp:shell_public', |
|
Eugene But (OOO till 7-30)
2016/05/07 00:07:52
This creates a cycle in file dependencies, because
Ken Rockot(use gerrit already)
2016/05/09 15:44:37
Lame gyp behavior. There isn't really an interesti
Eugene But (OOO till 7-30)
2016/05/12 20:48:10
This is now fixed.
|
| '../../ui/base/ui_base.gyp:ui_base', |
| '../../ui/gfx/gfx.gyp:gfx', |
| '../../ui/gfx/gfx.gyp:gfx_geometry', |
| @@ -268,6 +271,8 @@ |
| 'webui/crw_web_ui_manager.mm', |
| 'webui/crw_web_ui_page_builder.h', |
| 'webui/crw_web_ui_page_builder.mm', |
| + 'webui/mojo_facade.h', |
| + 'webui/mojo_facade.mm', |
| 'webui/shared_resources_data_source_ios.h', |
| 'webui/shared_resources_data_source_ios.mm', |
| 'webui/url_data_manager_ios.cc', |
| @@ -363,7 +368,7 @@ |
| 'variables': { |
| 'closure_entry_point': '__crWeb.webUIBundle', |
| 'js_bundle_files': [ |
| - 'webui/resources/web_ui_base.js', |
| + 'webui/resources/web_ui_base.js', |
| 'webui/resources/web_ui_bind.js', |
| 'webui/resources/web_ui_bundle.js', |
| 'webui/resources/web_ui_favicons.js', |
| @@ -371,7 +376,7 @@ |
| ], |
| }, |
| 'sources': [ |
| - 'webui/resources/web_ui_base.js', |
| + 'webui/resources/web_ui_base.js', |
| 'webui/resources/web_ui_bind.js', |
| 'webui/resources/web_ui_bundle.js', |
| 'webui/resources/web_ui_favicons.js', |
| @@ -433,6 +438,7 @@ |
| '../../testing/gtest.gyp:gtest', |
| '../../third_party/ocmock/ocmock.gyp:ocmock', |
| 'ios_web', |
| + 'test_mojo_bindings', |
| ], |
| 'include_dirs': [ |
| '../..', |
| @@ -486,9 +492,22 @@ |
| 'test/web_test_suite.h', |
| 'test/wk_web_view_crash_utils.h', |
| 'test/wk_web_view_crash_utils.mm', |
| + '<(SHARED_INTERMEDIATE_DIR)/ios/web/test/mojo_test.mojom.cc', |
| ], |
| }, |
| { |
| + 'target_name': 'test_mojo_bindings', |
| + # The type of this target must be none. This is so that resources can |
| + # depend upon this target for generating the js bindings files. Any |
| + # generated cpp files be listed explicitly in browser_ui. |
|
Ken Rockot(use gerrit already)
2016/05/09 15:44:37
You should be able to avoid this (manually listing
Eugene But (OOO till 7-30)
2016/05/10 02:00:55
If I do this:
{
# GN version: //ios/we
Eugene But (OOO till 7-30)
2016/05/12 20:48:10
That gyp error was related to other changes. Done.
|
| + 'type': 'none', |
| + 'sources': [ |
| + # GN version: TODO |
| + 'test/mojo_test.mojom', |
| + ], |
| + 'includes': [ '../../mojo/mojom_bindings_generator.gypi' ], |
| + }, |
| + { |
| # GN version: //ios/web:user_agent |
| 'target_name': 'user_agent', |
| 'type': 'static_library', |