| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 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 'variables': { | 9 'variables': { |
| 10 'version_py_path': 'tools/build/version.py', | 10 'version_py_path': 'tools/build/version.py', |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 'browser', | 26 'browser', |
| 27 'debugger', | 27 'debugger', |
| 28 'renderer', | 28 'renderer', |
| 29 'syncapi', | 29 'syncapi', |
| 30 'utility', | 30 'utility', |
| 31 'profile_import', | 31 'profile_import', |
| 32 'worker', | 32 'worker', |
| 33 '../printing/printing.gyp:printing', | 33 '../printing/printing.gyp:printing', |
| 34 '../webkit/webkit.gyp:inspector_resources', | 34 '../webkit/webkit.gyp:inspector_resources', |
| 35 ], | 35 ], |
| 36 'nacl_win64_dependencies': [ | |
| 37 'common_nacl_win64', | |
| 38 'common_constants_win64', | |
| 39 ], | |
| 40 'allocator_target': '../base/allocator/allocator.gyp:allocator', | 36 'allocator_target': '../base/allocator/allocator.gyp:allocator', |
| 41 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 37 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 42 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', | 38 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', |
| 43 'chrome_strings_grds': [ | 39 'chrome_strings_grds': [ |
| 44 # Localizable resources. | 40 # Localizable resources. |
| 45 'app/resources/locale_settings.grd', | 41 'app/resources/locale_settings.grd', |
| 46 'app/chromium_strings.grd', | 42 'app/chromium_strings.grd', |
| 47 'app/generated_resources.grd', | 43 'app/generated_resources.grd', |
| 48 'app/google_chrome_strings.grd', | 44 'app/google_chrome_strings.grd', |
| 49 ], | 45 ], |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 # TODO(gregoryd): consider getting this from NaCl's common.gypi | 97 # TODO(gregoryd): consider getting this from NaCl's common.gypi |
| 102 'NACL_TARGET_SUBARCH=64', | 98 'NACL_TARGET_SUBARCH=64', |
| 103 'NACL_BUILD_SUBARCH=64', | 99 'NACL_BUILD_SUBARCH=64', |
| 104 ], | 100 ], |
| 105 }], | 101 }], |
| 106 ], # conditions | 102 ], # conditions |
| 107 }, # variables | 103 }, # variables |
| 108 'includes': [ | 104 'includes': [ |
| 109 # Place some targets in gypi files to reduce contention on this file. | 105 # Place some targets in gypi files to reduce contention on this file. |
| 110 # By using an include, we keep everything in a single xcodeproj file. | 106 # By using an include, we keep everything in a single xcodeproj file. |
| 111 # Note on Win64 targets: targets that end with win64 be used | |
| 112 # on 64-bit Windows only. Targets that end with nacl_win64 should be used | |
| 113 # by Native Client only. | |
| 114 'chrome_browser.gypi', | 107 'chrome_browser.gypi', |
| 115 'chrome_common.gypi', | |
| 116 'chrome_dll.gypi', | |
| 117 'chrome_exe.gypi', | |
| 118 'chrome_renderer.gypi', | 108 'chrome_renderer.gypi', |
| 119 'chrome_tests.gypi', | 109 'chrome_tests.gypi', |
| 120 'common_constants.gypi', | |
| 121 'nacl.gypi', | |
| 122 ], | 110 ], |
| 123 'targets': [ | 111 'targets': [ |
| 124 { | 112 { |
| 125 # TODO(mark): It would be better if each static library that needed | 113 # TODO(mark): It would be better if each static library that needed |
| 126 # to run grit would list its own .grd files, but unfortunately some | 114 # to run grit would list its own .grd files, but unfortunately some |
| 127 # of the static libraries currently have circular dependencies among | 115 # of the static libraries currently have circular dependencies among |
| 128 # generated headers. | 116 # generated headers. |
| 129 'target_name': 'chrome_resources', | 117 'target_name': 'chrome_resources', |
| 130 'type': 'none', | 118 'type': 'none', |
| 131 'msvs_guid': 'B95AB527-F7DB-41E9-AD91-EB51EE0F56BE', | 119 'msvs_guid': 'B95AB527-F7DB-41E9-AD91-EB51EE0F56BE', |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 { | 334 { |
| 347 'destination': '<(PRODUCT_DIR)/extensions', | 335 'destination': '<(PRODUCT_DIR)/extensions', |
| 348 'files': [ | 336 'files': [ |
| 349 'browser/extensions/default_extensions/external_extensions.json' | 337 'browser/extensions/default_extensions/external_extensions.json' |
| 350 ] | 338 ] |
| 351 } | 339 } |
| 352 ], | 340 ], |
| 353 }], | 341 }], |
| 354 ], | 342 ], |
| 355 }, | 343 }, |
| 344 { |
| 345 'target_name': 'common_constants', |
| 346 'type': '<(library)', |
| 347 'dependencies': [ |
| 348 '../base/base.gyp:base', |
| 349 ], |
| 350 'conditions': [ |
| 351 ['OS=="linux"', { |
| 352 'dependencies': ['../build/linux/system.gyp:gtk'], |
| 353 }], |
| 354 ], |
| 355 'sources': [ |
| 356 'common/chrome_constants.cc', |
| 357 'common/chrome_constants.h', |
| 358 'common/chrome_paths.cc', |
| 359 'common/chrome_paths.h', |
| 360 'common/chrome_paths_internal.h', |
| 361 'common/chrome_paths_linux.cc', |
| 362 'common/chrome_paths_mac.mm', |
| 363 'common/chrome_paths_win.cc', |
| 364 'common/chrome_switches.cc', |
| 365 'common/chrome_switches.h', |
| 366 'common/env_vars.cc', |
| 367 'common/env_vars.h', |
| 368 'common/json_value_serializer.cc', |
| 369 'common/json_value_serializer.h', |
| 370 'common/pref_names.cc', |
| 371 'common/pref_names.h', |
| 372 ], |
| 373 'actions': [ |
| 374 { |
| 375 'action_name': 'Make chrome_version.cc', |
| 376 'variables': { |
| 377 'make_version_cc_path': 'tools/build/make_version_cc.py', |
| 378 }, |
| 379 'inputs': [ |
| 380 '<(make_version_cc_path)', |
| 381 'VERSION', |
| 382 ], |
| 383 'outputs': [ |
| 384 '<(INTERMEDIATE_DIR)/chrome_version.cc', |
| 385 ], |
| 386 'action': [ |
| 387 'python', |
| 388 '<(make_version_cc_path)', |
| 389 '<@(_outputs)', |
| 390 '<(version_full)', |
| 391 ], |
| 392 'process_outputs_as_sources': 1, |
| 393 }, |
| 394 ], |
| 395 }, |
| 396 { |
| 397 'target_name': 'common', |
| 398 'type': '<(library)', |
| 399 'msvs_guid': '899F1280-3441-4D1F-BA04-CCD6208D9146', |
| 400 'dependencies': [ |
| 401 'common_constants', |
| 402 'chrome_resources', |
| 403 'chrome_strings', |
| 404 'theme_resources', |
| 405 '../app/app.gyp:app_base', |
| 406 '../app/app.gyp:app_resources', |
| 407 '../base/base.gyp:base', |
| 408 '../base/base.gyp:base_i18n', |
| 409 '../build/temp_gyp/googleurl.gyp:googleurl', |
| 410 '../ipc/ipc.gyp:ipc', |
| 411 '../net/net.gyp:net', |
| 412 '../net/net.gyp:net_resources', |
| 413 '../skia/skia.gyp:skia', |
| 414 '../third_party/icu/icu.gyp:icui18n', |
| 415 '../third_party/icu/icu.gyp:icuuc', |
| 416 '../third_party/libxml/libxml.gyp:libxml', |
| 417 '../third_party/sqlite/sqlite.gyp:sqlite', |
| 418 '../third_party/zlib/zlib.gyp:zlib', |
| 419 '../third_party/npapi/npapi.gyp:npapi', |
| 420 '../webkit/webkit.gyp:appcache', |
| 421 '../webkit/webkit.gyp:glue', |
| 422 ], |
| 423 'include_dirs': [ |
| 424 '..', |
| 425 ], |
| 426 'sources': [ |
| 427 # All .cc, .h, and .mm files under chrome/common except for tests. |
| 428 'common/desktop_notifications/active_notification_tracker.h', |
| 429 'common/desktop_notifications/active_notification_tracker.cc', |
| 430 'common/extensions/extension.cc', |
| 431 'common/extensions/extension.h', |
| 432 'common/extensions/extension_constants.cc', |
| 433 'common/extensions/extension_constants.h', |
| 434 'common/extensions/extension_error_reporter.cc', |
| 435 'common/extensions/extension_error_reporter.h', |
| 436 'common/extensions/extension_error_utils.cc', |
| 437 'common/extensions/extension_error_utils.h', |
| 438 'common/extensions/extension_action.cc', |
| 439 'common/extensions/extension_action.h', |
| 440 'common/extensions/extension_l10n_util.cc', |
| 441 'common/extensions/extension_l10n_util.h', |
| 442 'common/extensions/extension_message_bundle.cc', |
| 443 'common/extensions/extension_message_bundle.h', |
| 444 'common/extensions/extension_resource.cc', |
| 445 'common/extensions/extension_resource.h', |
| 446 'common/extensions/extension_unpacker.cc', |
| 447 'common/extensions/extension_unpacker.h', |
| 448 'common/extensions/update_manifest.cc', |
| 449 'common/extensions/update_manifest.h', |
| 450 'common/extensions/url_pattern.cc', |
| 451 'common/extensions/url_pattern.h', |
| 452 'common/extensions/user_script.cc', |
| 453 'common/extensions/user_script.h', |
| 454 'common/gfx/utils.h', |
| 455 'common/net/dns.h', |
| 456 'common/net/net_resource_provider.cc', |
| 457 'common/net/net_resource_provider.h', |
| 458 'common/net/socket_stream.h', |
| 459 'common/net/url_request_intercept_job.cc', |
| 460 'common/net/url_request_intercept_job.h', |
| 461 'common/web_resource/web_resource_unpacker.cc', |
| 462 'common/web_resource/web_resource_unpacker.h', |
| 463 'common/appcache/appcache_backend_proxy.cc', |
| 464 'common/appcache/appcache_backend_proxy.h', |
| 465 'common/appcache/appcache_dispatcher.cc', |
| 466 'common/appcache/appcache_dispatcher.h', |
| 467 'common/appcache/appcache_dispatcher_host.cc', |
| 468 'common/appcache/appcache_dispatcher_host.h', |
| 469 'common/appcache/appcache_frontend_proxy.cc', |
| 470 'common/appcache/appcache_frontend_proxy.h', |
| 471 'common/appcache/chrome_appcache_service.cc', |
| 472 'common/appcache/chrome_appcache_service.h', |
| 473 'common/automation_constants.cc', |
| 474 'common/automation_constants.h', |
| 475 'common/bindings_policy.h', |
| 476 'common/child_process.cc', |
| 477 'common/child_process.h', |
| 478 'common/child_process_host.cc', |
| 479 'common/child_process_host.h', |
| 480 'common/child_process_info.cc', |
| 481 'common/child_process_info.h', |
| 482 'common/child_process_logging.h', |
| 483 'common/child_process_logging_linux.cc', |
| 484 'common/child_process_logging_mac.mm', |
| 485 'common/child_process_logging_win.cc', |
| 486 'common/child_thread.cc', |
| 487 'common/child_thread.h', |
| 488 'common/chrome_counters.cc', |
| 489 'common/chrome_counters.h', |
| 490 'common/chrome_descriptors.h', |
| 491 'common/chrome_plugin_api.h', |
| 492 'common/chrome_plugin_lib.cc', |
| 493 'common/chrome_plugin_lib.h', |
| 494 'common/chrome_plugin_util.cc', |
| 495 'common/chrome_plugin_util.h', |
| 496 'common/command_buffer_messages.h', |
| 497 'common/command_buffer_messages_internal.h', |
| 498 'common/common_glue.cc', |
| 499 'common/common_param_traits.cc', |
| 500 'common/common_param_traits.h', |
| 501 'common/css_colors.h', |
| 502 'common/db_message_filter.cc', |
| 503 'common/db_message_filter.h', |
| 504 'common/debug_flags.cc', |
| 505 'common/debug_flags.h', |
| 506 'common/devtools_messages.h', |
| 507 'common/devtools_messages_internal.h', |
| 508 'common/dom_storage_type.h', |
| 509 'common/filter_policy.h', |
| 510 'common/gears_api.h', |
| 511 'common/gtk_tree.cc', |
| 512 'common/gtk_tree.h', |
| 513 'common/gtk_util.cc', |
| 514 'common/gtk_util.h', |
| 515 'common/histogram_synchronizer.cc', |
| 516 'common/histogram_synchronizer.h', |
| 517 'common/important_file_writer.cc', |
| 518 'common/important_file_writer.h', |
| 519 'common/jstemplate_builder.cc', |
| 520 'common/jstemplate_builder.h', |
| 521 'common/libxml_utils.cc', |
| 522 'common/libxml_utils.h', |
| 523 'common/logging_chrome.cc', |
| 524 'common/logging_chrome.h', |
| 525 'common/main_function_params.h', |
| 526 'common/message_router.cc', |
| 527 'common/message_router.h', |
| 528 'common/mru_cache.h', |
| 529 'common/nacl_messages.h', |
| 530 'common/nacl_messages_internal.h', |
| 531 'common/navigation_gesture.h', |
| 532 'common/navigation_types.h', |
| 533 'common/native_web_keyboard_event.h', |
| 534 'common/native_web_keyboard_event_linux.cc', |
| 535 'common/native_web_keyboard_event_mac.mm', |
| 536 'common/native_web_keyboard_event_win.cc', |
| 537 'common/native_window_notification_source.h', |
| 538 'common/notification_details.h', |
| 539 'common/notification_observer.h', |
| 540 'common/notification_registrar.cc', |
| 541 'common/notification_registrar.h', |
| 542 'common/notification_service.cc', |
| 543 'common/notification_service.h', |
| 544 'common/notification_source.h', |
| 545 'common/notification_type.h', |
| 546 'common/owned_widget_gtk.cc', |
| 547 'common/owned_widget_gtk.h', |
| 548 'common/page_transition_types.h', |
| 549 'common/page_zoom.h', |
| 550 'common/platform_util.h', |
| 551 'common/platform_util_linux.cc', |
| 552 'common/platform_util_mac.mm', |
| 553 'common/platform_util_win.cc', |
| 554 'common/plugin_carbon_interpose_constants_mac.h', |
| 555 'common/plugin_carbon_interpose_constants_mac.cc', |
| 556 'common/plugin_messages.h', |
| 557 'common/plugin_messages_internal.h', |
| 558 'common/pref_member.cc', |
| 559 'common/pref_member.h', |
| 560 'common/pref_service.cc', |
| 561 'common/pref_service.h', |
| 562 'common/process_watcher_mac.cc', |
| 563 'common/process_watcher_posix.cc', |
| 564 'common/process_watcher_win.cc', |
| 565 'common/process_watcher.h', |
| 566 'common/property_bag.cc', |
| 567 'common/property_bag.h', |
| 568 'common/ref_counted_util.h', |
| 569 'common/render_messages.h', |
| 570 'common/render_messages_internal.h', |
| 571 'common/renderer_preferences.h', |
| 572 'common/resource_dispatcher.cc', |
| 573 'common/resource_dispatcher.h', |
| 574 'common/result_codes.h', |
| 575 'common/sandbox_init_wrapper.h', |
| 576 'common/sandbox_init_wrapper_linux.cc', |
| 577 'common/sandbox_init_wrapper_mac.cc', |
| 578 'common/sandbox_init_wrapper_win.cc', |
| 579 'common/sandbox_mac.h', |
| 580 'common/sandbox_mac.mm', |
| 581 'common/spellcheck_common.cc', |
| 582 'common/spellcheck_common.h', |
| 583 'common/security_filter_peer.cc', |
| 584 'common/security_filter_peer.h', |
| 585 'common/socket_stream_dispatcher.cc', |
| 586 'common/socket_stream_dispatcher.h', |
| 587 'common/sqlite_compiled_statement.cc', |
| 588 'common/sqlite_compiled_statement.h', |
| 589 'common/sqlite_utils.cc', |
| 590 'common/sqlite_utils.h', |
| 591 'common/task_queue.cc', |
| 592 'common/task_queue.h', |
| 593 'common/temp_scaffolding_stubs.cc', |
| 594 'common/temp_scaffolding_stubs.h', |
| 595 'common/thumbnail_score.cc', |
| 596 'common/thumbnail_score.h', |
| 597 'common/time_format.cc', |
| 598 'common/time_format.h', |
| 599 'common/transport_dib.h', |
| 600 'common/transport_dib_linux.cc', |
| 601 'common/transport_dib_mac.cc', |
| 602 'common/transport_dib_win.cc', |
| 603 'common/url_constants.cc', |
| 604 'common/url_constants.h', |
| 605 'common/utility_messages.h', |
| 606 'common/utility_messages_internal.h', |
| 607 'common/view_types.cc', |
| 608 'common/view_types.h', |
| 609 'common/visitedlink_common.cc', |
| 610 'common/visitedlink_common.h', |
| 611 'common/webkit_param_traits.h', |
| 612 'common/webmessageportchannel_impl.cc', |
| 613 'common/webmessageportchannel_impl.h', |
| 614 'common/win_safe_util.cc', |
| 615 'common/win_safe_util.h', |
| 616 'common/worker_messages.h', |
| 617 'common/worker_messages_internal.h', |
| 618 'common/worker_thread_ticker.cc', |
| 619 'common/worker_thread_ticker.h', |
| 620 'common/x11_util.cc', |
| 621 'common/x11_util.h', |
| 622 'common/x11_util_internal.h', |
| 623 'common/zip.cc', # Requires zlib directly. |
| 624 'common/zip.h', |
| 625 ], |
| 626 'direct_dependent_settings': { |
| 627 'include_dirs': [ |
| 628 '..', |
| 629 ], |
| 630 }, |
| 631 'export_dependent_settings': [ |
| 632 '../app/app.gyp:app_base', |
| 633 ], |
| 634 'conditions': [ |
| 635 ['OS=="linux"', { |
| 636 'dependencies': [ |
| 637 '../build/linux/system.gyp:gtk', |
| 638 ], |
| 639 'export_dependent_settings': [ |
| 640 '../third_party/sqlite/sqlite.gyp:sqlite', |
| 641 ], |
| 642 'link_settings': { |
| 643 'libraries': [ |
| 644 '-lX11', |
| 645 '-lXrender', |
| 646 '-lXext', |
| 647 ], |
| 648 }, |
| 649 },], |
| 650 ['OS=="linux" and selinux==1', { |
| 651 'dependencies': [ |
| 652 '../build/linux/system.gyp:selinux', |
| 653 ], |
| 654 }], |
| 655 ['OS=="mac"', { |
| 656 'sources!': [ |
| 657 'common/process_watcher_posix.cc', |
| 658 ], |
| 659 }], |
| 660 ['OS=="win"', { |
| 661 'include_dirs': [ |
| 662 'third_party/wtl/include', |
| 663 ], |
| 664 }, { # else: OS != "win" |
| 665 'sources!': [ |
| 666 'common/hi_res_timer_manager.cc', |
| 667 'common/hi_res_timer_manager.h', |
| 668 'common/temp_scaffolding_stubs.h', |
| 669 ], |
| 670 }], |
| 671 ['OS=="win" or OS=="linux"', { |
| 672 'sources!': [ |
| 673 'common/temp_scaffolding_stubs.cc', |
| 674 ], |
| 675 }], |
| 676 ], |
| 677 }, |
| 356 { | 678 { |
| 357 'target_name': 'debugger', | 679 'target_name': 'debugger', |
| 358 'type': '<(library)', | 680 'type': '<(library)', |
| 359 'msvs_guid': '57823D8C-A317-4713-9125-2C91FDFD12D6', | 681 'msvs_guid': '57823D8C-A317-4713-9125-2C91FDFD12D6', |
| 360 'dependencies': [ | 682 'dependencies': [ |
| 361 'chrome_resources', | 683 'chrome_resources', |
| 362 'chrome_strings', | 684 'chrome_strings', |
| 363 'theme_resources', | 685 'theme_resources', |
| 364 '../skia/skia.gyp:skia', | 686 '../skia/skia.gyp:skia', |
| 365 '../third_party/icu/icu.gyp:icui18n', | 687 '../third_party/icu/icu.gyp:icui18n', |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 },], | 783 },], |
| 462 ['enable_gpu==1', { | 784 ['enable_gpu==1', { |
| 463 'sources': [ | 785 'sources': [ |
| 464 'plugin/command_buffer_stub.cc', | 786 'plugin/command_buffer_stub.cc', |
| 465 'plugin/command_buffer_stub.h', | 787 'plugin/command_buffer_stub.h', |
| 466 ], | 788 ], |
| 467 },], | 789 },], |
| 468 ], | 790 ], |
| 469 }, | 791 }, |
| 470 { | 792 { |
| 793 'target_name': 'nacl', |
| 794 'type': '<(library)', |
| 795 'msvs_guid': '83E86DAF-5763-4711-AD34-5FDAE395560C', |
| 796 'dependencies': [ |
| 797 'common', |
| 798 'chrome_resources', |
| 799 'chrome_strings', |
| 800 '../third_party/npapi/npapi.gyp:npapi', |
| 801 '../webkit/webkit.gyp:glue', |
| 802 '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome
', |
| 803 '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', |
| 804 '../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate
', |
| 805 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:plat
form_qual_lib', |
| 806 ], |
| 807 'include_dirs': [ |
| 808 '<(INTERMEDIATE_DIR)', |
| 809 ], |
| 810 'defines': [ |
| 811 'NACL_BLOCK_SHIFT=5', |
| 812 'NACL_BLOCK_SIZE=32', |
| 813 '<@(nacl_defines)', |
| 814 ], |
| 815 'sources': [ |
| 816 # All .cc, .h, .m, and .mm files under nacl except for tests and |
| 817 # mocks. |
| 818 'nacl/sel_main.cc', |
| 819 'nacl/nacl_main.cc', |
| 820 'nacl/nacl_thread.cc', |
| 821 'nacl/nacl_thread.h', |
| 822 ], |
| 823 # TODO(gregoryd): consider switching NaCl to use Chrome OS defines |
| 824 'conditions': [ |
| 825 ['OS=="win"', { |
| 826 'defines': [ |
| 827 '__STD_C', |
| 828 '_CRT_SECURE_NO_DEPRECATE', |
| 829 '_SCL_SECURE_NO_DEPRECATE', |
| 830 ], |
| 831 'include_dirs': [ |
| 832 'third_party/wtl/include', |
| 833 ], |
| 834 },], |
| 835 ], |
| 836 }, |
| 837 { |
| 471 'target_name': 'utility', | 838 'target_name': 'utility', |
| 472 'type': '<(library)', | 839 'type': '<(library)', |
| 473 'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7', | 840 'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7', |
| 474 'dependencies': [ | 841 'dependencies': [ |
| 475 '../base/base.gyp:base', | 842 '../base/base.gyp:base', |
| 476 '../skia/skia.gyp:skia', | 843 '../skia/skia.gyp:skia', |
| 477 ], | 844 ], |
| 478 'sources': [ | 845 'sources': [ |
| 479 'utility/utility_main.cc', | 846 'utility/utility_main.cc', |
| 480 'utility/utility_thread.cc', | 847 'utility/utility_thread.cc', |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 528 'worker/worker_thread.cc', | 895 'worker/worker_thread.cc', |
| 529 'worker/worker_thread.h', | 896 'worker/worker_thread.h', |
| 530 'worker/worker_webkitclient_impl.cc', | 897 'worker/worker_webkitclient_impl.cc', |
| 531 'worker/worker_webkitclient_impl.h', | 898 'worker/worker_webkitclient_impl.h', |
| 532 ], | 899 ], |
| 533 'include_dirs': [ | 900 'include_dirs': [ |
| 534 '..', | 901 '..', |
| 535 ], | 902 ], |
| 536 }, | 903 }, |
| 537 { | 904 { |
| 905 'target_name': 'chrome', |
| 906 'type': 'executable', |
| 907 'mac_bundle': 1, |
| 908 'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC', |
| 909 'sources': [ |
| 910 # All .cc, .h, .m, and .mm files under app except for tests. |
| 911 'app/breakpad_win.cc', |
| 912 'app/breakpad_win.h', |
| 913 'app/chrome_exe_main.cc', |
| 914 'app/chrome_exe_main.mm', |
| 915 'app/chrome_exe_main_gtk.cc', |
| 916 'app/chrome_exe_resource.h', |
| 917 'app/client_util.cc', |
| 918 'app/client_util.h', |
| 919 'app/hard_error_handler_win.cc', |
| 920 'app/hard_error_handler_win.h', |
| 921 'app/scoped_ole_initializer.h', |
| 922 ], |
| 923 'mac_bundle_resources': [ |
| 924 'app/app-Info.plist', |
| 925 ], |
| 926 # TODO(mark): Come up with a fancier way to do this. It should only |
| 927 # be necessary to list app-Info.plist once, not the three times it is |
| 928 # listed here. |
| 929 'mac_bundle_resources!': [ |
| 930 'app/app-Info.plist', |
| 931 ], |
| 932 'xcode_settings': { |
| 933 'INFOPLIST_FILE': 'app/app-Info.plist', |
| 934 }, |
| 935 'conditions': [ |
| 936 ['chrome_frame_define==1 and OS=="win"', { |
| 937 'dependencies': [ |
| 938 '../chrome_frame/chrome_frame.gyp:npchrome_tab', |
| 939 ], |
| 940 }], |
| 941 ['OS=="linux" or OS=="freebsd"', { |
| 942 'actions': [ |
| 943 { |
| 944 'action_name': 'manpage', |
| 945 'conditions': [ |
| 946 [ 'branding == "Chrome"', { |
| 947 'variables': { |
| 948 'name': 'Google Chrome', |
| 949 'filename': 'google-chrome', |
| 950 'confdir': 'google-chrome', |
| 951 }, |
| 952 }, { # else branding!="Chrome" |
| 953 'variables': { |
| 954 'name': 'Chromium', |
| 955 'filename': 'chromium-browser', |
| 956 'confdir': 'chromium', |
| 957 }, |
| 958 }], |
| 959 ], |
| 960 'inputs': [ |
| 961 'tools/build/linux/sed.sh', |
| 962 'app/resources/manpage.1.in', |
| 963 ], |
| 964 'outputs': [ |
| 965 '<(PRODUCT_DIR)/chrome.1', |
| 966 ], |
| 967 'action': [ |
| 968 'tools/build/linux/sed.sh', |
| 969 'app/resources/manpage.1.in', |
| 970 '<@(_outputs)', |
| 971 '-e', 's/@@NAME@@/<(name)/', |
| 972 '-e', 's/@@FILENAME@@/<(filename)/', |
| 973 '-e', 's/@@CONFDIR@@/<(confdir)/', |
| 974 ], |
| 975 'message': 'Generating manpage' |
| 976 }, |
| 977 ], |
| 978 'conditions': [ |
| 979 [ 'linux_use_tcmalloc==1', { |
| 980 'dependencies': [ |
| 981 '<(allocator_target)', |
| 982 ], |
| 983 }, |
| 984 ], |
| 985 ], |
| 986 'dependencies': [ |
| 987 # On Linux, link the dependencies (libraries) that make up actual |
| 988 # Chromium functionality directly into the executable. |
| 989 '<@(chromium_dependencies)', |
| 990 # Needed for chrome_dll_main.cc #include of gtk/gtk.h |
| 991 '../build/linux/system.gyp:gtk', |
| 992 'packed_resources', |
| 993 ], |
| 994 'sources': [ |
| 995 'app/chrome_dll_main.cc', |
| 996 'app/chrome_dll_resource.h', |
| 997 ], |
| 998 'copies': [ |
| 999 { |
| 1000 'destination': '<(PRODUCT_DIR)', |
| 1001 'files': ['tools/build/linux/chrome-wrapper', |
| 1002 '../third_party/xdg-utils/scripts/xdg-settings', |
| 1003 ], |
| 1004 # The wrapper script above may need to generate a .desktop file, |
| 1005 # which requires an icon. So, copy one next to the script. |
| 1006 'conditions': [ |
| 1007 ['branding=="Chrome"', { |
| 1008 'files': ['app/theme/google_chrome/product_logo_48.png'] |
| 1009 }, { # else: 'branding!="Chrome" |
| 1010 'files': ['app/theme/chromium/product_logo_48.png'] |
| 1011 }], |
| 1012 ], |
| 1013 }, |
| 1014 ], |
| 1015 }], |
| 1016 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', { |
| 1017 'dependencies': [ |
| 1018 '../views/views.gyp:views', |
| 1019 ], |
| 1020 }], |
| 1021 ['OS=="mac"', { |
| 1022 'variables': { |
| 1023 'mac_packaging_dir': |
| 1024 '<(PRODUCT_DIR)/<(mac_product_name) Packaging', |
| 1025 # <(PRODUCT_DIR) expands to $(BUILT_PRODUCTS_DIR), which doesn't |
| 1026 # work properly in a shell script, where ${BUILT_PRODUCTS_DIR} is |
| 1027 # needed. |
| 1028 'mac_packaging_sh_dir': |
| 1029 '${BUILT_PRODUCTS_DIR}/<(mac_product_name) Packaging', |
| 1030 }, |
| 1031 # 'branding' is a variable defined in common.gypi |
| 1032 # (e.g. "Chromium", "Chrome") |
| 1033 'conditions': [ |
| 1034 ['branding=="Chrome"', { |
| 1035 'mac_bundle_resources': [ |
| 1036 'app/theme/google_chrome/app.icns', |
| 1037 'app/theme/google_chrome/document.icns', |
| 1038 ], |
| 1039 }, { # else: 'branding!="Chrome" |
| 1040 'mac_bundle_resources': [ |
| 1041 'app/theme/chromium/app.icns', |
| 1042 'app/theme/chromium/document.icns', |
| 1043 ], |
| 1044 }], |
| 1045 ['mac_breakpad==1', { |
| 1046 'variables': { |
| 1047 # A real .dSYM is needed for dump_syms to operate on. |
| 1048 'mac_real_dsym': 1, |
| 1049 }, |
| 1050 'dependencies': [ |
| 1051 '../breakpad/breakpad.gyp:dump_syms', |
| 1052 '../breakpad/breakpad.gyp:symupload', |
| 1053 ], |
| 1054 # The "Dump Symbols" post-build step is in a target_conditions |
| 1055 # block so that it will follow the "Strip If Needed" step if that |
| 1056 # is also being used. There is no standard configuration where |
| 1057 # both of these steps occur together, but Mark likes to use this |
| 1058 # configuraiton sometimes when testing Breakpad-enabled builds |
| 1059 # without the time overhead of creating real .dSYM files. When |
| 1060 # both "Dump Symbols" and "Strip If Needed" are present, "Dump |
| 1061 # Symbols" must come second because "Strip If Needed" creates |
| 1062 # a fake .dSYM that dump_syms needs to fake dump. Since |
| 1063 # "Strip If Needed" is added in a target_conditions block in |
| 1064 # common.gypi, "Dump Symbols" needs to be in an (always true) |
| 1065 # target_conditions block. |
| 1066 'target_conditions': [ |
| 1067 ['1 == 1', { |
| 1068 'postbuilds': [ |
| 1069 { |
| 1070 'postbuild_name': 'Dump Symbols', |
| 1071 'variables': { |
| 1072 'dump_product_syms_path': |
| 1073 'tools/build/mac/dump_product_syms', |
| 1074 }, |
| 1075 'action': ['<(dump_product_syms_path)', |
| 1076 '<(branding)'], |
| 1077 }, |
| 1078 ], |
| 1079 }], |
| 1080 ], |
| 1081 }], # mac_breakpad |
| 1082 ['mac_keystone==1', { |
| 1083 'copies': [ |
| 1084 { |
| 1085 # Put keystone_install.sh where the packaging system will |
| 1086 # find it. The packager will copy this script to the |
| 1087 # correct location on the disk image. |
| 1088 'destination': '<(mac_packaging_dir)', |
| 1089 'files': [ |
| 1090 'tools/build/mac/keystone_install.sh', |
| 1091 ], |
| 1092 }, |
| 1093 ], |
| 1094 }], # mac_keystone |
| 1095 ['buildtype=="Official"', { |
| 1096 'actions': [ |
| 1097 { |
| 1098 # Create sign.sh, the script that the packaging system will |
| 1099 # use to sign the .app bundle. |
| 1100 'action_name': 'Make sign.sh', |
| 1101 'variables': { |
| 1102 'make_sign_sh_path': 'tools/build/mac/make_sign_sh', |
| 1103 'sign_sh_in_path': 'tools/build/mac/sign.sh.in', |
| 1104 'app_resource_rules_in_path': |
| 1105 'tools/build/mac/app_resource_rules.plist.in', |
| 1106 }, |
| 1107 'inputs': [ |
| 1108 '<(make_sign_sh_path)', |
| 1109 '<(sign_sh_in_path)', |
| 1110 '<(app_resource_rules_in_path)', |
| 1111 '<(version_path)', |
| 1112 ], |
| 1113 'outputs': [ |
| 1114 '<(mac_packaging_dir)/sign.sh', |
| 1115 '<(mac_packaging_dir)/app_resource_rules.plist', |
| 1116 ], |
| 1117 'action': [ |
| 1118 '<(make_sign_sh_path)', |
| 1119 '<(mac_packaging_sh_dir)', |
| 1120 '<(mac_product_name)', |
| 1121 '<(version_full)', |
| 1122 ], |
| 1123 }, |
| 1124 ], |
| 1125 }], # buildtype=="Official" |
| 1126 ], |
| 1127 'product_name': '<(mac_product_name)', |
| 1128 'xcode_settings': { |
| 1129 # chrome/app/app-Info.plist has: |
| 1130 # CFBundleIdentifier of CHROMIUM_BUNDLE_ID |
| 1131 # CFBundleName of CHROMIUM_SHORT_NAME |
| 1132 # CFBundleSignature of CHROMIUM_CREATOR |
| 1133 # Xcode then replaces these values with the branded values we set |
| 1134 # as settings on the target. |
| 1135 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)', |
| 1136 'CHROMIUM_CREATOR': '<(mac_creator)', |
| 1137 'CHROMIUM_SHORT_NAME': '<(branding)', |
| 1138 }, |
| 1139 'dependencies': [ |
| 1140 'helper_app', |
| 1141 'infoplist_strings_tool', |
| 1142 # This library provides the real implementation for NaClSyscallSeg |
| 1143 '../native_client/src/trusted/service_runtime/arch/x86_32/service_ru
ntime_x86_32.gyp:service_runtime_x86_32_chrome' |
| 1144 ], |
| 1145 'actions': [ |
| 1146 { |
| 1147 # Generate the InfoPlist.strings file |
| 1148 'action_name': 'Generating InfoPlist.strings files', |
| 1149 'variables': { |
| 1150 'tool_path': '<(PRODUCT_DIR)/infoplist_strings_tool', |
| 1151 # Unique dir to write to so the [lang].lproj/InfoPlist.strings |
| 1152 # for the main app and the helper app don't name collide. |
| 1153 'output_path': '<(INTERMEDIATE_DIR)/app_infoplist_strings', |
| 1154 }, |
| 1155 'conditions': [ |
| 1156 [ 'branding == "Chrome"', { |
| 1157 'variables': { |
| 1158 'branding_name': 'google_chrome_strings', |
| 1159 }, |
| 1160 }, { # else branding!="Chrome" |
| 1161 'variables': { |
| 1162 'branding_name': 'chromium_strings', |
| 1163 }, |
| 1164 }], |
| 1165 ], |
| 1166 'inputs': [ |
| 1167 '<(tool_path)', |
| 1168 '<(version_path)', |
| 1169 # TODO: remove this helper when we have loops in GYP |
| 1170 '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(branding_name)_ZZL
OCALE.pak\' <(locales))', |
| 1171 ], |
| 1172 'outputs': [ |
| 1173 # TODO: remove this helper when we have loops in GYP |
| 1174 '>!@(<(apply_locales_cmd) -d \'<(output_path)/ZZLOCALE.lproj/Inf
oPlist.strings\' <(locales))', |
| 1175 ], |
| 1176 'action': [ |
| 1177 '<(tool_path)', |
| 1178 '-b', '<(branding_name)', |
| 1179 '-v', '<(version_path)', |
| 1180 '-g', '<(grit_out_dir)', |
| 1181 '-o', '<(output_path)', |
| 1182 '-t', 'main', |
| 1183 '<@(locales)', |
| 1184 ], |
| 1185 'message': 'Generating the language InfoPlist.strings files', |
| 1186 'process_outputs_as_mac_bundle_resources': 1, |
| 1187 }, |
| 1188 ], |
| 1189 'copies': [ |
| 1190 { |
| 1191 'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Ve
rsions/<(version_full)', |
| 1192 'files': [ |
| 1193 '<(PRODUCT_DIR)/<(mac_product_name) Helper.app', |
| 1194 ], |
| 1195 }, |
| 1196 ], |
| 1197 'postbuilds': [ |
| 1198 { |
| 1199 'postbuild_name': 'Copy <(mac_product_name) Framework.framework', |
| 1200 'action': [ |
| 1201 'tools/build/mac/copy_framework_unversioned', |
| 1202 '${BUILT_PRODUCTS_DIR}/<(mac_product_name) Framework.framework', |
| 1203 '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Versions/<(versio
n_full)', |
| 1204 ], |
| 1205 }, |
| 1206 { |
| 1207 # Modify the Info.plist as needed. The script explains why this |
| 1208 # is needed. This is also done in the helper_app and chrome_dll |
| 1209 # targets. Use -b0 and -k0 to not include any Breakpad or |
| 1210 # Keystone information; that all goes into the framework's |
| 1211 # Info.plist. Use -s1 to include Subversion information. |
| 1212 'postbuild_name': 'Tweak Info.plist', |
| 1213 'action': ['<(tweak_info_plist_path)', |
| 1214 '-b0', |
| 1215 '-k0', |
| 1216 '-s1', |
| 1217 '<(branding)', |
| 1218 '<(mac_bundle_id)'], |
| 1219 }, |
| 1220 { |
| 1221 'postbuild_name': 'Clean up old versions', |
| 1222 'action': [ |
| 1223 'tools/build/mac/clean_up_old_versions', |
| 1224 '<(version_full)' |
| 1225 ], |
| 1226 }, |
| 1227 ], # postbuilds |
| 1228 }, { # else: OS != "mac" |
| 1229 'conditions': [ |
| 1230 ['branding=="Chrome"', { |
| 1231 'product_name': 'chrome' |
| 1232 }, { # else: Branding!="Chrome" |
| 1233 # TODO: change to: |
| 1234 # 'product_name': 'chromium' |
| 1235 # whenever we convert the rest of the infrastructure |
| 1236 # (buildbots etc.) to use "gyp -Dbranding=Chrome". |
| 1237 # NOTE: chrome/app/theme/chromium/BRANDING and |
| 1238 # chrome/app/theme/google_chrome/BRANDING have the short names, |
| 1239 # etc.; should we try to extract from there instead? |
| 1240 'product_name': 'chrome' |
| 1241 }], |
| 1242 ], |
| 1243 }], |
| 1244 ['OS=="linux"', { |
| 1245 'conditions': [ |
| 1246 ['branding=="Chrome"', { |
| 1247 'dependencies': [ |
| 1248 'installer/installer.gyp:linux_installer_configs', |
| 1249 ], |
| 1250 }], |
| 1251 ['selinux==0', { |
| 1252 'dependencies': [ |
| 1253 '../sandbox/sandbox.gyp:sandbox', |
| 1254 ], |
| 1255 }], |
| 1256 ['linux_sandbox_path != ""', { |
| 1257 'defines': [ |
| 1258 'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"', |
| 1259 ], |
| 1260 }], |
| 1261 ], |
| 1262 }], |
| 1263 ['OS=="mac" or OS=="win"', { |
| 1264 'dependencies': [ |
| 1265 # On Windows and Mac, make sure we've built chrome_dll, which |
| 1266 # contains all of the library code with Chromium functionality. |
| 1267 'chrome_dll', |
| 1268 ], |
| 1269 }], |
| 1270 ['OS=="win"', { |
| 1271 'dependencies': [ |
| 1272 'installer/installer.gyp:installer_util', |
| 1273 'installer/installer.gyp:installer_util_strings', |
| 1274 '../breakpad/breakpad.gyp:breakpad_handler', |
| 1275 '../breakpad/breakpad.gyp:breakpad_sender', |
| 1276 '../sandbox/sandbox.gyp:sandbox', |
| 1277 'app/locales/locales.gyp:*', |
| 1278 ], |
| 1279 'sources': [ |
| 1280 'app/chrome_exe.rc', |
| 1281 'app/chrome_exe_version.rc.version', |
| 1282 ], |
| 1283 'include_dirs': [ |
| 1284 '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 1285 ], |
| 1286 'msvs_settings': { |
| 1287 'VCLinkerTool': { |
| 1288 'DelayLoadDLLs': [ |
| 1289 'dbghelp.dll', |
| 1290 'dwmapi.dll', |
| 1291 'uxtheme.dll', |
| 1292 'ole32.dll', |
| 1293 'oleaut32.dll', |
| 1294 ], |
| 1295 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', |
| 1296 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', |
| 1297 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself. |
| 1298 'SubSystem': '2', |
| 1299 }, |
| 1300 'VCManifestTool': { |
| 1301 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.exe.manifes
t', |
| 1302 }, |
| 1303 }, |
| 1304 'actions': [ |
| 1305 { |
| 1306 'action_name': 'version', |
| 1307 'variables': { |
| 1308 'template_input_path': 'app/chrome_exe_version.rc.version', |
| 1309 }, |
| 1310 'conditions': [ |
| 1311 [ 'branding == "Chrome"', { |
| 1312 'variables': { |
| 1313 'branding_path': 'app/theme/google_chrome/BRANDING', |
| 1314 }, |
| 1315 }, { # else branding!="Chrome" |
| 1316 'variables': { |
| 1317 'branding_path': 'app/theme/chromium/BRANDING', |
| 1318 }, |
| 1319 }], |
| 1320 ], |
| 1321 'inputs': [ |
| 1322 '<(template_input_path)', |
| 1323 '<(version_path)', |
| 1324 '<(branding_path)', |
| 1325 ], |
| 1326 'outputs': [ |
| 1327 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_exe_version.rc', |
| 1328 ], |
| 1329 'action': [ |
| 1330 'python', |
| 1331 '<(version_py_path)', |
| 1332 '-f', '<(version_path)', |
| 1333 '-f', '<(branding_path)', |
| 1334 '<(template_input_path)', |
| 1335 '<@(_outputs)', |
| 1336 ], |
| 1337 'process_outputs_as_sources': 1, |
| 1338 'message': 'Generating version information in <(_outputs)' |
| 1339 }, |
| 1340 { |
| 1341 'action_name': 'first_run', |
| 1342 'inputs': [ |
| 1343 'app/FirstRun', |
| 1344 ], |
| 1345 'outputs': [ |
| 1346 '<(PRODUCT_DIR)/First Run', |
| 1347 ], |
| 1348 'action': ['cp', '-f', '<@(_inputs)', '<@(_outputs)'], |
| 1349 'message': 'Copy first run complete sentinel file', |
| 1350 }, |
| 1351 ], |
| 1352 }, { # 'OS!="win" |
| 1353 'sources!': [ |
| 1354 'app/chrome_exe_main.cc', |
| 1355 'app/client_util.cc', |
| 1356 ] |
| 1357 }], |
| 1358 ], |
| 1359 }, |
| 1360 { |
| 538 # Provides a syncapi dynamic library target from checked-in binaries, | 1361 # Provides a syncapi dynamic library target from checked-in binaries, |
| 539 # or from compiling a stub implementation. | 1362 # or from compiling a stub implementation. |
| 540 'target_name': 'syncapi', | 1363 'target_name': 'syncapi', |
| 541 'type': '<(library)', | 1364 'type': '<(library)', |
| 542 'sources': [ | 1365 'sources': [ |
| 543 'browser/sync/engine/syncapi.cc', | 1366 'browser/sync/engine/syncapi.cc', |
| 544 ], | 1367 ], |
| 545 'include_dirs': [ | 1368 'include_dirs': [ |
| 546 '..', | 1369 '..', |
| 547 '<(protoc_out_dir)', | 1370 '<(protoc_out_dir)', |
| 548 ], | 1371 ], |
| 549 'defines' : [ | 1372 'defines' : [ |
| 550 '_CRT_SECURE_NO_WARNINGS', | 1373 '_CRT_SECURE_NO_WARNINGS', |
| 551 '_USE_32BIT_TIME_T', | 1374 '_USE_32BIT_TIME_T', |
| 552 ], | 1375 ], |
| 553 'dependencies': [ | 1376 'dependencies': [ |
| 554 '../base/base.gyp:base', | 1377 '../base/base.gyp:base', |
| 555 '../build/temp_gyp/googleurl.gyp:googleurl', | 1378 '../build/temp_gyp/googleurl.gyp:googleurl', |
| 1379 '../net/net.gyp:net_base', |
| 556 '../third_party/icu/icu.gyp:icuuc', | 1380 '../third_party/icu/icu.gyp:icuuc', |
| 557 '../third_party/libjingle/libjingle.gyp:libjingle', | 1381 '../third_party/libjingle/libjingle.gyp:libjingle', |
| 558 '../third_party/sqlite/sqlite.gyp:sqlite', | 1382 '../third_party/sqlite/sqlite.gyp:sqlite', |
| 559 'common_constants', | 1383 'common_constants', |
| 560 'notifier', | 1384 'notifier', |
| 561 'sync', | 1385 'sync', |
| 562 'sync_proto', | 1386 'sync_proto', |
| 563 ], | 1387 ], |
| 564 }, | 1388 }, |
| 565 { | 1389 { |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 837 'link_settings': { | 1661 'link_settings': { |
| 838 'libraries': [ | 1662 'libraries': [ |
| 839 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework', | 1663 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework', |
| 840 ], | 1664 ], |
| 841 }, | 1665 }, |
| 842 }], | 1666 }], |
| 843 ], | 1667 ], |
| 844 }, | 1668 }, |
| 845 ], | 1669 ], |
| 846 'conditions': [ | 1670 'conditions': [ |
| 1671 ['OS=="mac" or OS=="win"', { |
| 1672 'targets': [ |
| 1673 { |
| 1674 'target_name': 'chrome_dll', |
| 1675 'type': 'shared_library', |
| 1676 'dependencies': [ |
| 1677 '<@(chromium_dependencies)', |
| 1678 ], |
| 1679 'conditions': [ |
| 1680 ['OS=="win"', { |
| 1681 'product_name': 'chrome', |
| 1682 'msvs_guid': 'C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9', |
| 1683 'include_dirs': [ |
| 1684 'third_party/wtl/include', |
| 1685 ], |
| 1686 'dependencies': [ |
| 1687 # On Windows, link the dependencies (libraries) that make |
| 1688 # up actual Chromium functionality into this .dll. |
| 1689 'chrome_dll_version', |
| 1690 'chrome_resources', |
| 1691 'installer/installer.gyp:installer_util_strings', |
| 1692 'worker', |
| 1693 '../printing/printing.gyp:printing', |
| 1694 '../net/net.gyp:net_resources', |
| 1695 '../build/util/support/support.gyp:*', |
| 1696 '../third_party/cld/cld.gyp:cld', |
| 1697 '../views/views.gyp:views', |
| 1698 '../webkit/webkit.gyp:webkit_resources', |
| 1699 '../gears/gears.gyp:gears', |
| 1700 ], |
| 1701 'defines': [ |
| 1702 'CHROME_DLL', |
| 1703 'BROWSER_DLL', |
| 1704 'RENDERER_DLL', |
| 1705 'PLUGIN_DLL', |
| 1706 ], |
| 1707 'sources': [ |
| 1708 'app/chrome_dll.rc', |
| 1709 'app/chrome_dll_main.cc', |
| 1710 'app/chrome_dll_resource.h', |
| 1711 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_versio
n.rc', |
| 1712 |
| 1713 '../webkit/glue/resources/aliasb.cur', |
| 1714 '../webkit/glue/resources/cell.cur', |
| 1715 '../webkit/glue/resources/col_resize.cur', |
| 1716 '../webkit/glue/resources/copy.cur', |
| 1717 '../webkit/glue/resources/row_resize.cur', |
| 1718 '../webkit/glue/resources/vertical_text.cur', |
| 1719 '../webkit/glue/resources/zoom_in.cur', |
| 1720 '../webkit/glue/resources/zoom_out.cur', |
| 1721 |
| 1722 # TODO: It would be nice to have these pulled in |
| 1723 # automatically from direct_dependent_settings in |
| 1724 # their various targets (net.gyp:net_resources, etc.), |
| 1725 # but that causes errors in other targets when |
| 1726 # resulting .res files get referenced multiple times. |
| 1727 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', |
| 1728 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', |
| 1729 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
| 1730 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |
| 1731 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
| 1732 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', |
| 1733 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
| 1734 |
| 1735 # TODO(sgk): left-over from pre-gyp build, figure out |
| 1736 # if we still need them and/or how to update to gyp. |
| 1737 #'app/check_dependents.bat', |
| 1738 #'app/chrome.dll.deps', |
| 1739 ], |
| 1740 'msvs_settings': { |
| 1741 'VCLinkerTool': { |
| 1742 'BaseAddress': '0x01c30000', |
| 1743 'DelayLoadDLLs': [ |
| 1744 'crypt32.dll', |
| 1745 'cryptui.dll', |
| 1746 'winhttp.dll', |
| 1747 'wininet.dll', |
| 1748 'wsock32.dll', |
| 1749 'ws2_32.dll', |
| 1750 'winspool.drv', |
| 1751 'comdlg32.dll', |
| 1752 'imagehlp.dll', |
| 1753 'urlmon.dll', |
| 1754 'imm32.dll', |
| 1755 'iphlpapi.dll', |
| 1756 ], |
| 1757 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib', |
| 1758 'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb', |
| 1759 # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency). |
| 1760 'SubSystem': '2', |
| 1761 }, |
| 1762 'VCManifestTool': { |
| 1763 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.man
ifest', |
| 1764 }, |
| 1765 }, |
| 1766 'configurations': { |
| 1767 'Debug': { |
| 1768 'msvs_settings': { |
| 1769 'VCLinkerTool': { |
| 1770 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 1771 }, |
| 1772 }, |
| 1773 }, |
| 1774 }, |
| 1775 }], # OS=="win" |
| 1776 ['OS=="mac"', { |
| 1777 # The main browser executable's name is <(mac_product_name). |
| 1778 # Certain things will get confused if two modules in the |
| 1779 # executable share the same name, so append " Framework" to the |
| 1780 # product_name used for the framework. This will result in |
| 1781 # a name like "Chromium Framework.framework". |
| 1782 'product_name': '<(mac_product_name) Framework', |
| 1783 'mac_bundle': 1, |
| 1784 'xcode_settings': { |
| 1785 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)', |
| 1786 |
| 1787 # The dylib versions are of the form a[.b[.c]], where a is a |
| 1788 # 16-bit unsigned integer, and b and c are 8-bit unsigned |
| 1789 # integers. Any missing component is taken to be 0. The |
| 1790 # best mapping from product version numbers into this scheme |
| 1791 # is to just use the build and patch numbers. There is no |
| 1792 # ambiguity in this scheme because the build number is |
| 1793 # guaranteed unique even across distinct major and minor |
| 1794 # version numbers. These settings correspond to |
| 1795 # -compatibility_version and -current_version. |
| 1796 'DYLIB_COMPATIBILITY_VERSION': '<(version_build_patch)', |
| 1797 'DYLIB_CURRENT_VERSION': '<(version_build_patch)', |
| 1798 |
| 1799 # The framework is placed within the .app's versioned |
| 1800 # directory. DYLIB_INSTALL_NAME_BASE and |
| 1801 # LD_DYLIB_INSTALL_NAME affect -install_name. |
| 1802 'DYLIB_INSTALL_NAME_BASE': |
| 1803 '@executable_path/../Versions/<(version_full)', |
| 1804 # See tools/build/mac/copy_framework_unversioned for |
| 1805 # information on LD_DYLIB_INSTALL_NAME. |
| 1806 'LD_DYLIB_INSTALL_NAME': |
| 1807 '$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(WRAPPER_NAME)/
$(PRODUCT_NAME)', |
| 1808 |
| 1809 'INFOPLIST_FILE': 'app/framework-Info.plist', |
| 1810 |
| 1811 # Define the order of symbols within the framework. This |
| 1812 # sets -order_file. |
| 1813 'ORDER_FILE': 'app/framework.order', |
| 1814 }, |
| 1815 'sources': [ |
| 1816 'app/chrome_dll_main.cc', |
| 1817 'app/chrome_dll_resource.h', |
| 1818 'app/chrome_exe_main.mm', |
| 1819 ], |
| 1820 # TODO(mark): Come up with a fancier way to do this. It should |
| 1821 # only be necessary to list framework-Info.plist once, not the |
| 1822 # three times it is listed here. |
| 1823 'mac_bundle_resources': [ |
| 1824 'app/framework-Info.plist', |
| 1825 'app/nibs/About.xib', |
| 1826 'app/nibs/AboutIPC.xib', |
| 1827 'app/nibs/BookmarkAllTabs.xib', |
| 1828 'app/nibs/BookmarkBar.xib', |
| 1829 'app/nibs/BookmarkBubble.xib', |
| 1830 'app/nibs/BookmarkEditor.xib', |
| 1831 'app/nibs/BookmarkNameFolder.xib', |
| 1832 'app/nibs/BrowserWindow.xib', |
| 1833 'app/nibs/ClearBrowsingData.xib', |
| 1834 'app/nibs/DownloadItem.xib', |
| 1835 'app/nibs/DownloadShelf.xib', |
| 1836 'app/nibs/EditSearchEngine.xib', |
| 1837 'app/nibs/ExtensionShelf.xib', |
| 1838 'app/nibs/FindBar.xib', |
| 1839 'app/nibs/FirstRunDialog.xib', |
| 1840 'app/nibs/FontLanguageSettings.xib', |
| 1841 'app/nibs/HungRendererDialog.xib', |
| 1842 'app/nibs/HttpAuthLoginSheet.xib', |
| 1843 'app/nibs/ImportSettingsDialog.xib', |
| 1844 'app/nibs/InfoBar.xib', |
| 1845 'app/nibs/InfoBarContainer.xib', |
| 1846 'app/nibs/ImportProgressDialog.xib', |
| 1847 'app/nibs/KeywordEditor.xib', |
| 1848 'app/nibs/MainMenu.xib', |
| 1849 'app/nibs/PageInfo.xib', |
| 1850 'app/nibs/Preferences.xib', |
| 1851 'app/nibs/ReportBug.xib', |
| 1852 'app/nibs/SaveAccessoryView.xib', |
| 1853 'app/nibs/SadTab.xib', |
| 1854 'app/nibs/TabContents.xib', |
| 1855 'app/nibs/TabView.xib', |
| 1856 'app/nibs/TaskManager.xib', |
| 1857 'app/nibs/Toolbar.xib', |
| 1858 'app/theme/back_Template.pdf', |
| 1859 'app/theme/chevron.png', # TODO(jrg): get and use a pdf version |
| 1860 'app/theme/close_bar.pdf', |
| 1861 'app/theme/close_bar_h.pdf', |
| 1862 'app/theme/close_bar_p.pdf', |
| 1863 'app/theme/find_next_Template.pdf', |
| 1864 'app/theme/find_prev_Template.pdf', |
| 1865 'app/theme/forward_Template.pdf', |
| 1866 'app/theme/go_Template.pdf', |
| 1867 'app/theme/home_Template.pdf', |
| 1868 'app/theme/menu_chrome_rtl_Template.pdf', |
| 1869 'app/theme/menu_chrome_Template.pdf', |
| 1870 'app/theme/menu_page_rtl_Template.pdf', |
| 1871 'app/theme/menu_page_Template.pdf', |
| 1872 'app/theme/nav.pdf', |
| 1873 'app/theme/newtab.pdf', |
| 1874 'app/theme/newtab_h.pdf', |
| 1875 'app/theme/newtab_p.pdf', |
| 1876 'app/theme/otr_icon.pdf', |
| 1877 'app/theme/reload_Template.pdf', |
| 1878 'app/theme/star_Template.pdf', |
| 1879 'app/theme/starred.pdf', |
| 1880 'app/theme/stop_Template.pdf', |
| 1881 ], |
| 1882 'mac_bundle_resources!': [ |
| 1883 'app/framework-Info.plist', |
| 1884 ], |
| 1885 'dependencies': [ |
| 1886 # Bring in pdfsqueeze and run it on all pdfs |
| 1887 '../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze', |
| 1888 '../build/util/support/support.gyp:*', |
| 1889 ], |
| 1890 'rules': [ |
| 1891 { |
| 1892 'rule_name': 'pdfsqueeze', |
| 1893 'extension': 'pdf', |
| 1894 'inputs': [ |
| 1895 '<(PRODUCT_DIR)/pdfsqueeze', |
| 1896 ], |
| 1897 'outputs': [ |
| 1898 '<(INTERMEDIATE_DIR)/pdfsqueeze/<(RULE_INPUT_ROOT).pdf', |
| 1899 ], |
| 1900 'action': ['<(PRODUCT_DIR)/pdfsqueeze', |
| 1901 '<(RULE_INPUT_PATH)', '<@(_outputs)'], |
| 1902 'message': 'Running pdfsqueeze on <(RULE_INPUT_PATH)', |
| 1903 }, |
| 1904 ], |
| 1905 'variables': { |
| 1906 'repack_path': '../tools/data_pack/repack.py', |
| 1907 }, |
| 1908 'actions': [ |
| 1909 # TODO(mark): These actions are duplicated for Linux and |
| 1910 # FreeBSD in the chrome target. Can they be unified? |
| 1911 { |
| 1912 'action_name': 'repack_chrome', |
| 1913 'variables': { |
| 1914 'pak_inputs': [ |
| 1915 '<(grit_out_dir)/browser_resources.pak', |
| 1916 '<(grit_out_dir)/common_resources.pak', |
| 1917 '<(grit_out_dir)/renderer_resources.pak', |
| 1918 '<(grit_out_dir)/theme_resources.pak', |
| 1919 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resource
s.pak', |
| 1920 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', |
| 1921 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', |
| 1922 ], |
| 1923 }, |
| 1924 'inputs': [ |
| 1925 '<(repack_path)', |
| 1926 '<@(pak_inputs)', |
| 1927 ], |
| 1928 'outputs': [ |
| 1929 '<(INTERMEDIATE_DIR)/repack/chrome.pak', |
| 1930 ], |
| 1931 'action': ['python', '<(repack_path)', '<@(_outputs)', |
| 1932 '<@(pak_inputs)'], |
| 1933 'process_outputs_as_mac_bundle_resources': 1, |
| 1934 }, |
| 1935 { |
| 1936 'action_name': 'repack_locales', |
| 1937 'process_outputs_as_mac_bundle_resources': 1, |
| 1938 'variables': { |
| 1939 'conditions': [ |
| 1940 ['branding=="Chrome"', { |
| 1941 'branding_flag': ['-b', 'google_chrome',], |
| 1942 }, { # else: branding!="Chrome" |
| 1943 'branding_flag': ['-b', 'chromium',], |
| 1944 }], |
| 1945 ], |
| 1946 }, |
| 1947 'inputs': [ |
| 1948 'tools/build/repack_locales.py', |
| 1949 # NOTE: Ideally the common command args would be shared |
| 1950 # amongst inputs/outputs/action, but the args include shell |
| 1951 # variables which need to be passed intact, and command |
| 1952 # expansion wants to expand the shell variables. Adding the |
| 1953 # explicit quoting here was the only way it seemed to work. |
| 1954 '>!@(<(repack_locales_cmd) -i <(branding_flag) -g \'<(grit_o
ut_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales
))', |
| 1955 ], |
| 1956 'outputs': [ |
| 1957 '>!@(<(repack_locales_cmd) -o -g \'<(grit_out_dir)\' -s \'<(
SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))', |
| 1958 ], |
| 1959 'action': [ |
| 1960 '<@(repack_locales_cmd)', |
| 1961 '<@(branding_flag)', |
| 1962 '-g', '<(grit_out_dir)', |
| 1963 '-s', '<(SHARED_INTERMEDIATE_DIR)', |
| 1964 '-x', '<(INTERMEDIATE_DIR)', |
| 1965 '<@(locales)', |
| 1966 ], |
| 1967 }, |
| 1968 ], |
| 1969 'postbuilds': [ |
| 1970 { |
| 1971 # This step causes an error to be raised if the .order file |
| 1972 # does not account for all global text symbols. It |
| 1973 # validates the completeness of the .order file. |
| 1974 'postbuild_name': 'Verify global text symbol order', |
| 1975 'variables': { |
| 1976 'verify_order_path': 'tools/build/mac/verify_order', |
| 1977 }, |
| 1978 'action': [ |
| 1979 '<(verify_order_path)', |
| 1980 '_ChromeMain', |
| 1981 '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}', |
| 1982 ], |
| 1983 }, |
| 1984 { |
| 1985 # Modify the Info.plist as needed. The script explains why |
| 1986 # this is needed. This is also done in the chrome target. |
| 1987 # The framework needs the Breakpad and Keystone keys if |
| 1988 # those features are enabled. It doesn't currently use the |
| 1989 # Subversion keys for anything, but this seems like a really |
| 1990 # good place to store them. |
| 1991 'postbuild_name': 'Tweak Info.plist', |
| 1992 'action': ['<(tweak_info_plist_path)', |
| 1993 '-b<(mac_breakpad)', |
| 1994 '-k<(mac_keystone)', |
| 1995 '-s1', |
| 1996 '<(branding)', |
| 1997 '<(mac_bundle_id)'], |
| 1998 }, |
| 1999 { |
| 2000 'postbuild_name': 'Symlink Libraries', |
| 2001 'action': [ |
| 2002 'ln', |
| 2003 '-fhs', |
| 2004 'Versions/Current/Libraries', |
| 2005 '${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries' |
| 2006 ], |
| 2007 }, |
| 2008 ], |
| 2009 'copies': [ |
| 2010 { |
| 2011 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resourc
es', |
| 2012 'files': [ |
| 2013 '<(PRODUCT_DIR)/resources/inspector/' |
| 2014 ], |
| 2015 'conditions': [ |
| 2016 ['mac_breakpad==1', { |
| 2017 'files': [ |
| 2018 '<(PRODUCT_DIR)/crash_inspector', |
| 2019 '<(PRODUCT_DIR)/crash_report_sender.app' |
| 2020 ], |
| 2021 }], |
| 2022 ], |
| 2023 }, |
| 2024 { |
| 2025 'destination': |
| 2026 '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries', |
| 2027 'files': [ |
| 2028 # TODO(ajwong): Find a way to share this path with |
| 2029 # ffmpeg.gyp so they don't diverge. (BUG=23602) |
| 2030 '<(PRODUCT_DIR)/libffmpegsumo.dylib', |
| 2031 ], |
| 2032 }, |
| 2033 ], |
| 2034 'conditions': [ |
| 2035 ['mac_breakpad==1', { |
| 2036 'variables': { |
| 2037 # A real .dSYM is needed for dump_syms to operate on. |
| 2038 'mac_real_dsym': 1, |
| 2039 }, |
| 2040 'sources': [ |
| 2041 'app/breakpad_mac.mm', |
| 2042 'app/breakpad_mac.h', |
| 2043 ], |
| 2044 'dependencies': [ |
| 2045 '../breakpad/breakpad.gyp:breakpad', |
| 2046 ], |
| 2047 }, { # else: mac_breakpad!=1 |
| 2048 # No Breakpad, put in the stubs. |
| 2049 'sources': [ |
| 2050 'app/breakpad_mac_stubs.mm', |
| 2051 'app/breakpad_mac.h', |
| 2052 ], |
| 2053 }], # mac_breakpad |
| 2054 ['mac_keystone==1', { |
| 2055 'variables': { |
| 2056 'conditions': [ |
| 2057 ['branding=="Chrome"', { |
| 2058 'theme_dir_name': 'google_chrome', |
| 2059 }, { # else: 'branding!="Chrome" |
| 2060 'theme_dir_name': 'chromium', |
| 2061 }], |
| 2062 ], |
| 2063 }, |
| 2064 'mac_bundle_resources': [ |
| 2065 # This image is used to badge the lock icon in the |
| 2066 # promotion authentication dialog. It needs to exist as |
| 2067 # a file on disk and not just something in a resource |
| 2068 # bundle because that's the interface that Authorization |
| 2069 # Services uses. Also, Authorization Services can't deal |
| 2070 # with .icns files. |
| 2071 'app/theme/<(theme_dir_name)/product_logo_32.png', |
| 2072 |
| 2073 'browser/cocoa/keystone_promote_preflight.sh', |
| 2074 'browser/cocoa/keystone_promote_postflight.sh', |
| 2075 ], |
| 2076 'postbuilds': [ |
| 2077 { |
| 2078 'postbuild_name': 'Copy KeystoneRegistration.framework', |
| 2079 'action': [ |
| 2080 'tools/build/mac/copy_framework_unversioned', |
| 2081 '../third_party/googlemac/Releases/Keystone/KeystoneRegi
stration.framework', |
| 2082 '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Framework
s', |
| 2083 ], |
| 2084 }, |
| 2085 { |
| 2086 'postbuild_name': 'Symlink Frameworks', |
| 2087 'action': [ |
| 2088 'ln', |
| 2089 '-fhs', |
| 2090 'Versions/Current/Frameworks', |
| 2091 '${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Frameworks' |
| 2092 ], |
| 2093 }, |
| 2094 ], |
| 2095 }], # mac_keystone |
| 2096 ], # conditions |
| 2097 }], # OS=="mac" |
| 2098 ], # conditions |
| 2099 }, # target chrome_dll |
| 2100 ], # targets |
| 2101 }], # OS=="mac" or OS=="win" |
| 847 ['OS=="mac"', | 2102 ['OS=="mac"', |
| 848 { 'targets': [ | 2103 { 'targets': [ |
| 849 { | 2104 { |
| 850 'target_name': 'helper_app', | 2105 'target_name': 'helper_app', |
| 851 'type': 'executable', | 2106 'type': 'executable', |
| 852 'product_name': '<(mac_product_name) Helper', | 2107 'product_name': '<(mac_product_name) Helper', |
| 853 'mac_bundle': 1, | 2108 'mac_bundle': 1, |
| 854 'dependencies': [ | 2109 'dependencies': [ |
| 855 'chrome_dll', | 2110 'chrome_dll', |
| 856 'interpose_dependency_shim', | 2111 'interpose_dependency_shim', |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1159 ], | 2414 ], |
| 1160 'dependencies': [ | 2415 'dependencies': [ |
| 1161 'chrome', | 2416 'chrome', |
| 1162 '../breakpad/breakpad.gyp:dump_syms', | 2417 '../breakpad/breakpad.gyp:dump_syms', |
| 1163 ], | 2418 ], |
| 1164 }], | 2419 }], |
| 1165 ], | 2420 ], |
| 1166 } | 2421 } |
| 1167 ], | 2422 ], |
| 1168 },], # OS=="linux" | 2423 },], # OS=="linux" |
| 2424 ['OS!="win"', |
| 2425 { 'targets': [ |
| 2426 ], # targets |
| 2427 }], # OS!="win" |
| 1169 ['OS=="win"', | 2428 ['OS=="win"', |
| 1170 { 'targets': [ | 2429 { 'targets': [ |
| 1171 { | 2430 { |
| 1172 # TODO(sgk): remove this when we change the buildbots to | 2431 # TODO(sgk): remove this when we change the buildbots to |
| 1173 # use the generated build\all.sln file to build the world. | 2432 # use the generated build\all.sln file to build the world. |
| 1174 'target_name': 'pull_in_all', | 2433 'target_name': 'pull_in_all', |
| 1175 'type': 'none', | 2434 'type': 'none', |
| 1176 'dependencies': [ | 2435 'dependencies': [ |
| 1177 'installer/mini_installer.gyp:*', | 2436 'installer/mini_installer.gyp:*', |
| 1178 'installer/installer.gyp:*', | 2437 'installer/installer.gyp:*', |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1464 }], # targets | 2723 }], # targets |
| 1465 }], # OS=="linux" or OS=="freebsd" | 2724 }], # OS=="linux" or OS=="freebsd" |
| 1466 ], # 'conditions' | 2725 ], # 'conditions' |
| 1467 } | 2726 } |
| 1468 | 2727 |
| 1469 # Local Variables: | 2728 # Local Variables: |
| 1470 # tab-width:2 | 2729 # tab-width:2 |
| 1471 # indent-tabs-mode:nil | 2730 # indent-tabs-mode:nil |
| 1472 # End: | 2731 # End: |
| 1473 # vim: set expandtab tabstop=2 shiftwidth=2: | 2732 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |