Chromium Code Reviews| Index: ios/web/ios_web.gyp |
| diff --git a/ios/web/ios_web.gyp b/ios/web/ios_web.gyp |
| index a5ffd22343df410b7b093cfc2eed8f7549afb0c1..fb6004aa622fe39414684aa9f0fb708a1af52f65 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_public.gyp:shell_public', |
| '../../ui/base/ui_base.gyp:ui_base', |
| '../../ui/gfx/gfx.gyp:gfx', |
| '../../ui/gfx/gfx.gyp:gfx_geometry', |
| @@ -266,6 +269,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', |
| @@ -437,6 +442,7 @@ |
| '../../testing/gtest.gyp:gtest', |
| '../../third_party/ocmock/ocmock.gyp:ocmock', |
| 'ios_web', |
| + 'test_mojo_bindings', |
| ], |
| 'include_dirs': [ |
| '../..', |
| @@ -492,6 +498,35 @@ |
| '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', |
| + ], |
| + }, |
| + { |
| + # GN version: //ios/web/test:mojo_bindings |
| + 'target_name': 'test_mojo_bindings_mojom', |
|
Jackie Quinn
2016/05/16 22:28:16
Should (can?) this target be in the test.gypi file
Eugene But (OOO till 7-30)
2016/05/16 23:39:58
We don't have test.gypi in web. |test_mojo_binding
Jackie Quinn
2016/05/17 23:07:06
heh. okay. It just seems like all the testing stuf
Eugene But (OOO till 7-30)
2016/05/18 00:09:32
Well not all the tests are unit tests. We have 2 o
|
| + 'type': 'none', |
| + 'variables': { |
| + 'mojom_files': [ |
| + 'test/mojo_test.mojom', |
| + ], |
| + }, |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'includes': [ '../../mojo/mojom_bindings_generator_explicit.gypi' ], |
| + }, |
| + { |
| + # GN version: //ios/web/test:mojo_bindings |
| + 'target_name': 'test_mojo_bindings', |
| + 'type': 'static_library', |
| + 'dependencies': [ |
| + '../../mojo/mojo_base.gyp:mojo_common_lib', |
| + '../../mojo/mojo_base.gyp:mojo_url_type_converters', |
| + '../../mojo/mojo_public.gyp:mojo_cpp_bindings', |
| + 'test_mojo_bindings_mojom', |
| + ], |
| + 'include_dirs': [ |
| + '..', |
| ], |
| }, |
| { |