Chromium Code Reviews| Index: ios/web/ios_web_inttests.gyp |
| diff --git a/ios/web/ios_web_inttests.gyp b/ios/web/ios_web_inttests.gyp |
| index 771e2e75e9ad104e9f7dbeaf61b548b05086072b..b60c14d8f76c549cd74a9f6020dad4b09109a236 100644 |
| --- a/ios/web/ios_web_inttests.gyp |
| +++ b/ios/web/ios_web_inttests.gyp |
| @@ -12,16 +12,95 @@ |
| 'dependencies': [ |
| '../../base/base.gyp:base', |
| '../../base/base.gyp:test_support_base', |
| + '../../ios/provider/ios_provider_web.gyp:ios_provider_web', |
| '../../net/net.gyp:net_test_support', |
| + '../../services/shell/shell_public.gyp:shell_public', |
| '../../testing/gtest.gyp:gtest', |
| '../../ui/base/ui_base.gyp:ui_base_test_support', |
| 'ios_web.gyp:ios_web', |
| 'ios_web.gyp:ios_web_test_support', |
| + 'mojo_bindings', |
| + 'test_resources', |
| + 'packed_test_resources', |
| ], |
| 'sources': [ |
| 'browser_state_web_view_partition_inttest.mm', |
| 'public/test/http_server_inttest.mm', |
| 'test/run_all_unittests.cc', |
| + 'webui/web_ui_mojo_inttest.mm', |
| + ], |
| + 'mac_bundle_resources': [ |
| + '<(SHARED_INTERMEDIATE_DIR)/ios/web/test/resources.pak' |
| + ], |
| + }, |
| + { |
| + # GN version: //ios/web/test:mojo_bindings |
| + 'target_name': '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. |
| + 'type': 'none', |
| + 'sources': [ |
| + 'test/mojo_test.mojom', |
| + ], |
| + 'includes': [ '../../mojo/mojom_bindings_generator.gypi' ], |
| + }, |
| + { |
| + # GN version: //ios/web/test:resources |
| + 'target_name': 'test_resources', |
| + 'type': 'none', |
| + 'hard_dependency': 1, |
|
sdefresne
2016/05/28 13:04:02
As in GN, this target needs a dependency on the ta
Eugene But (OOO till 7-30)
2016/05/31 17:26:57
Done.
|
| + 'actions': [ |
| + { |
| + 'action_name': 'test_resources', |
| + 'variables': { |
| + 'grit_grd_file': 'test/test_resources.grd', |
| + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ios/web/test', |
| + 'grit_additional_defines': [ |
| + '-E', 'root_gen_dir=<(SHARED_INTERMEDIATE_DIR)', |
| + ], |
| + }, |
| + 'includes': [ '../../build/grit_action.gypi' ], |
| + }, |
| + ], |
| + 'copies': [ |
| + { |
| + 'destination': '<(PRODUCT_DIR)', |
| + 'files': [ |
| + '<(SHARED_INTERMEDIATE_DIR)/ios/web/test/test_resources.pak' |
| + ], |
| + }, |
| + ], |
| + 'direct_dependent_settings': { |
| + 'include_dirs': [ |
| + '<(SHARED_INTERMEDIATE_DIR)', |
| + ], |
| + }, |
| + }, |
| + { |
| + 'target_name': 'packed_test_resources', |
| + 'type': 'none', |
| + 'hard_depency': 1, |
| + 'dependencies': [ |
| + 'test_resources', |
| + ], |
| + 'variables': { |
| + 'repack_path': [ |
| + '../../tools/grit/grit/format/repack.py', |
| + ], |
| + }, |
| + 'actions': [ |
| + { |
| + 'action_name': 'repack_test_resources', |
| + 'variables': { |
| + 'pak_inputs': [ |
| + '<(SHARED_INTERMEDIATE_DIR)/ios/web/ios_web_resources.pak', |
| + '<(SHARED_INTERMEDIATE_DIR)/ios/web/test/test_resources.pak' |
| + ], |
| + 'pak_output': '<(SHARED_INTERMEDIATE_DIR)/ios/web/test/resources.pak', |
| + }, |
| + 'includes': [ '../../build/repack_action.gypi' ], |
| + }, |
| ], |
| }, |
| ], |