Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(529)

Side by Side Diff: ios/web/ios_web.gyp

Issue 1956113002: [ios Mojo] iOS facade class for Mojo API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 ], 44 ],
45 'dependencies': [ 45 'dependencies': [
46 'ios_web_core', 46 'ios_web_core',
47 'js_resources', 47 'js_resources',
48 'user_agent', 48 'user_agent',
49 '../../base/base.gyp:base', 49 '../../base/base.gyp:base',
50 '../../components/url_formatter/url_formatter.gyp:url_formatter', 50 '../../components/url_formatter/url_formatter.gyp:url_formatter',
51 '../../ios/net/ios_net.gyp:ios_net', 51 '../../ios/net/ios_net.gyp:ios_net',
52 '../../ios/third_party/blink/blink_html_tokenizer.gyp:blink_html_tokeniz er', 52 '../../ios/third_party/blink/blink_html_tokenizer.gyp:blink_html_tokeniz er',
53 '../../net/net.gyp:net', 53 '../../net/net.gyp:net',
54 '../../mojo/mojo_edk.gyp:mojo_system_impl',
55 '../../mojo/mojo_public.gyp:mojo_public',
56 '../../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.
54 '../../ui/base/ui_base.gyp:ui_base', 57 '../../ui/base/ui_base.gyp:ui_base',
55 '../../ui/gfx/gfx.gyp:gfx', 58 '../../ui/gfx/gfx.gyp:gfx',
56 '../../ui/gfx/gfx.gyp:gfx_geometry', 59 '../../ui/gfx/gfx.gyp:gfx_geometry',
57 '../../ui/resources/ui_resources.gyp:ui_resources', 60 '../../ui/resources/ui_resources.gyp:ui_resources',
58 '../../url/url.gyp:url_lib', 61 '../../url/url.gyp:url_lib',
59 ], 62 ],
60 'sources': [ 63 'sources': [
61 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/webui_resources_map.cc', 64 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/webui_resources_map.cc',
62 'active_state_manager_impl.h', 65 'active_state_manager_impl.h',
63 'active_state_manager_impl.mm', 66 'active_state_manager_impl.mm',
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 'web_state/web_view_internal_creation_util.mm', 264 'web_state/web_view_internal_creation_util.mm',
262 'web_state/wk_web_view_security_util.h', 265 'web_state/wk_web_view_security_util.h',
263 'web_state/wk_web_view_security_util.mm', 266 'web_state/wk_web_view_security_util.mm',
264 'web_thread_impl.cc', 267 'web_thread_impl.cc',
265 'web_thread_impl.h', 268 'web_thread_impl.h',
266 'web_view_creation_util.mm', 269 'web_view_creation_util.mm',
267 'webui/crw_web_ui_manager.h', 270 'webui/crw_web_ui_manager.h',
268 'webui/crw_web_ui_manager.mm', 271 'webui/crw_web_ui_manager.mm',
269 'webui/crw_web_ui_page_builder.h', 272 'webui/crw_web_ui_page_builder.h',
270 'webui/crw_web_ui_page_builder.mm', 273 'webui/crw_web_ui_page_builder.mm',
274 'webui/mojo_facade.h',
275 'webui/mojo_facade.mm',
271 'webui/shared_resources_data_source_ios.h', 276 'webui/shared_resources_data_source_ios.h',
272 'webui/shared_resources_data_source_ios.mm', 277 'webui/shared_resources_data_source_ios.mm',
273 'webui/url_data_manager_ios.cc', 278 'webui/url_data_manager_ios.cc',
274 'webui/url_data_manager_ios.h', 279 'webui/url_data_manager_ios.h',
275 'webui/url_data_manager_ios_backend.h', 280 'webui/url_data_manager_ios_backend.h',
276 'webui/url_data_manager_ios_backend.mm', 281 'webui/url_data_manager_ios_backend.mm',
277 'webui/url_data_source_ios.mm', 282 'webui/url_data_source_ios.mm',
278 'webui/url_data_source_ios_impl.cc', 283 'webui/url_data_source_ios_impl.cc',
279 'webui/url_data_source_ios_impl.h', 284 'webui/url_data_source_ios_impl.h',
280 'webui/url_fetcher_block_adapter.h', 285 'webui/url_fetcher_block_adapter.h',
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 'js_compile_bundle.gypi' 361 'js_compile_bundle.gypi'
357 ], 362 ],
358 }, 363 },
359 { 364 {
360 # GN version: //ios/web:web_ui_bundle 365 # GN version: //ios/web:web_ui_bundle
361 'target_name': 'ios_web_ui_js_bundle', 366 'target_name': 'ios_web_ui_js_bundle',
362 'type': 'none', 367 'type': 'none',
363 'variables': { 368 'variables': {
364 'closure_entry_point': '__crWeb.webUIBundle', 369 'closure_entry_point': '__crWeb.webUIBundle',
365 'js_bundle_files': [ 370 'js_bundle_files': [
366 'webui/resources/web_ui_base.js', 371 'webui/resources/web_ui_base.js',
367 'webui/resources/web_ui_bind.js', 372 'webui/resources/web_ui_bind.js',
368 'webui/resources/web_ui_bundle.js', 373 'webui/resources/web_ui_bundle.js',
369 'webui/resources/web_ui_favicons.js', 374 'webui/resources/web_ui_favicons.js',
370 'webui/resources/web_ui_send.js', 375 'webui/resources/web_ui_send.js',
371 ], 376 ],
372 }, 377 },
373 'sources': [ 378 'sources': [
374 'webui/resources/web_ui_base.js', 379 'webui/resources/web_ui_base.js',
375 'webui/resources/web_ui_bind.js', 380 'webui/resources/web_ui_bind.js',
376 'webui/resources/web_ui_bundle.js', 381 'webui/resources/web_ui_bundle.js',
377 'webui/resources/web_ui_favicons.js', 382 'webui/resources/web_ui_favicons.js',
378 'webui/resources/web_ui_send.js', 383 'webui/resources/web_ui_send.js',
379 ], 384 ],
380 '!sources': [ 385 '!sources': [
381 # Remove all js files except web_ui_bundle. Those files should not be 386 # Remove all js files except web_ui_bundle. Those files should not be
382 # copied with the rest of resources, as they just Closure dependencies 387 # copied with the rest of resources, as they just Closure dependencies
383 # for web_ui_bundle.js. Dependencies were added as sources, so they get 388 # for web_ui_bundle.js. Dependencies were added as sources, so they get
384 # indexed by Xcode. 389 # indexed by Xcode.
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 'type': 'static_library', 431 'type': 'static_library',
427 'dependencies': [ 432 'dependencies': [
428 '../../base/base.gyp:test_support_base', 433 '../../base/base.gyp:test_support_base',
429 '../../ios/testing/ios_testing.gyp:ocmock_support', 434 '../../ios/testing/ios_testing.gyp:ocmock_support',
430 '../../ios/third_party/gcdwebserver/gcdwebserver.gyp:gcdwebserver', 435 '../../ios/third_party/gcdwebserver/gcdwebserver.gyp:gcdwebserver',
431 '../../net/net.gyp:net_test_support', 436 '../../net/net.gyp:net_test_support',
432 '../../testing/gmock.gyp:gmock', 437 '../../testing/gmock.gyp:gmock',
433 '../../testing/gtest.gyp:gtest', 438 '../../testing/gtest.gyp:gtest',
434 '../../third_party/ocmock/ocmock.gyp:ocmock', 439 '../../third_party/ocmock/ocmock.gyp:ocmock',
435 'ios_web', 440 'ios_web',
441 'test_mojo_bindings',
436 ], 442 ],
437 'include_dirs': [ 443 'include_dirs': [
438 '../..', 444 '../..',
439 ], 445 ],
440 'sources': [ 446 'sources': [
441 'public/test/crw_test_js_injection_receiver.h', 447 'public/test/crw_test_js_injection_receiver.h',
442 'public/test/crw_test_js_injection_receiver.mm', 448 'public/test/crw_test_js_injection_receiver.mm',
443 'public/test/http_server.h', 449 'public/test/http_server.h',
444 'public/test/http_server.mm', 450 'public/test/http_server.mm',
445 'public/test/http_server_util.h', 451 'public/test/http_server_util.h',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 'test/test_web_thread.cc', 485 'test/test_web_thread.cc',
480 'test/test_web_thread_bundle.cc', 486 'test/test_web_thread_bundle.cc',
481 'test/web_int_test.h', 487 'test/web_int_test.h',
482 'test/web_int_test.mm', 488 'test/web_int_test.mm',
483 'test/web_test.h', 489 'test/web_test.h',
484 'test/web_test.mm', 490 'test/web_test.mm',
485 'test/web_test_suite.cc', 491 'test/web_test_suite.cc',
486 'test/web_test_suite.h', 492 'test/web_test_suite.h',
487 'test/wk_web_view_crash_utils.h', 493 'test/wk_web_view_crash_utils.h',
488 'test/wk_web_view_crash_utils.mm', 494 'test/wk_web_view_crash_utils.mm',
495 '<(SHARED_INTERMEDIATE_DIR)/ios/web/test/mojo_test.mojom.cc',
489 ], 496 ],
490 }, 497 },
491 { 498 {
499 'target_name': 'test_mojo_bindings',
500 # The type of this target must be none. This is so that resources can
501 # depend upon this target for generating the js bindings files. Any
502 # 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.
503 'type': 'none',
504 'sources': [
505 # GN version: TODO
506 'test/mojo_test.mojom',
507 ],
508 'includes': [ '../../mojo/mojom_bindings_generator.gypi' ],
509 },
510 {
492 # GN version: //ios/web:user_agent 511 # GN version: //ios/web:user_agent
493 'target_name': 'user_agent', 512 'target_name': 'user_agent',
494 'type': 'static_library', 513 'type': 'static_library',
495 'include_dirs': [ 514 'include_dirs': [
496 '../..', 515 '../..',
497 ], 516 ],
498 'dependencies': [ 517 'dependencies': [
499 '../../base/base.gyp:base' 518 '../../base/base.gyp:base'
500 ], 519 ],
501 'sources': [ 520 'sources': [
502 'public/user_agent.h', 521 'public/user_agent.h',
503 'public/user_agent.mm', 522 'public/user_agent.mm',
504 ], 523 ],
505 }, 524 },
506 ], 525 ],
507 } 526 }
OLDNEW
« no previous file with comments | « ios/web/BUILD.gn ('k') | ios/web/ios_web_unittests.gyp » ('j') | ios/web/webui/mojo_facade.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698