| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 13 matching lines...) Expand all Loading... |
| 24 ], | 24 ], |
| 25 }, { # OS != win | 25 }, { # OS != win |
| 26 'python': [ | 26 'python': [ |
| 27 'python' | 27 'python' |
| 28 ], | 28 ], |
| 29 }], | 29 }], |
| 30 ], | 30 ], |
| 31 }, | 31 }, |
| 32 'target_defaults': { | 32 'target_defaults': { |
| 33 'dependencies': [ | 33 'dependencies': [ |
| 34 # locales need to be built for the chrome frame binaries to be loadable. | |
| 35 'locales/locales.gyp:*', | |
| 36 '../chrome/chrome.gyp:chrome_resources', | 34 '../chrome/chrome.gyp:chrome_resources', |
| 37 '../chrome/chrome.gyp:chrome_strings', | 35 '../chrome/chrome.gyp:chrome_strings', |
| 38 '../chrome/chrome.gyp:packed_resources', | 36 '../chrome/chrome.gyp:packed_resources', |
| 39 '../chrome/chrome.gyp:theme_resources', | 37 '../chrome/chrome.gyp:theme_resources', |
| 40 '../skia/skia.gyp:skia', | 38 '../skia/skia.gyp:skia', |
| 41 ], | 39 ], |
| 42 'defines': [ 'ISOLATION_AWARE_ENABLED=1' ], | 40 'defines': [ 'ISOLATION_AWARE_ENABLED=1' ], |
| 43 'include_dirs': [ | 41 'include_dirs': [ |
| 44 # all our own includes are relative to src/ | 42 # all our own includes are relative to src/ |
| 45 '..', | 43 '..', |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 'dependencies': [ | 76 'dependencies': [ |
| 79 '../base/base.gyp:test_support_base', | 77 '../base/base.gyp:test_support_base', |
| 80 '../chrome/app/policy/cloud_policy_codegen.gyp:policy', | 78 '../chrome/app/policy/cloud_policy_codegen.gyp:policy', |
| 81 '../net/net.gyp:net', | 79 '../net/net.gyp:net', |
| 82 '../testing/gmock.gyp:gmock', | 80 '../testing/gmock.gyp:gmock', |
| 83 '../testing/gtest.gyp:gtest', | 81 '../testing/gtest.gyp:gtest', |
| 84 'chrome_frame_launcher.gyp:chrome_frame_helper_lib', | 82 'chrome_frame_launcher.gyp:chrome_frame_helper_lib', |
| 85 'chrome_frame_ie', | 83 'chrome_frame_ie', |
| 86 'chrome_frame_strings', | 84 'chrome_frame_strings', |
| 87 'chrome_tab_idl', | 85 'chrome_tab_idl', |
| 86 'locales/locales.gyp:*', |
| 88 ], | 87 ], |
| 89 'sources': [ | 88 'sources': [ |
| 90 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', | 89 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
| 91 'chrome_frame_unittest_main.cc', | 90 'chrome_frame_unittest_main.cc', |
| 92 'chrome_launcher.cc', | 91 'chrome_launcher.cc', |
| 93 'chrome_launcher.h', | 92 'chrome_launcher.h', |
| 94 'chrome_launcher_unittest.cc', | 93 'chrome_launcher_unittest.cc', |
| 95 'function_stub_unittest.cc', | 94 'function_stub_unittest.cc', |
| 96 'renderer_glue.cc', | 95 'renderer_glue.cc', |
| 97 'test/chrome_tab_mocks.h', | 96 'test/chrome_tab_mocks.h', |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 '../net/net.gyp:net_test_support', | 197 '../net/net.gyp:net_test_support', |
| 199 '../testing/gmock.gyp:gmock', | 198 '../testing/gmock.gyp:gmock', |
| 200 '../testing/gtest.gyp:gtest', | 199 '../testing/gtest.gyp:gtest', |
| 201 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', | 200 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', |
| 202 '../third_party/iaccessible2/iaccessible2.gyp:IAccessible2Proxy', | 201 '../third_party/iaccessible2/iaccessible2.gyp:IAccessible2Proxy', |
| 203 '../third_party/libxslt/libxslt.gyp:libxslt', | 202 '../third_party/libxslt/libxslt.gyp:libxslt', |
| 204 'chrome_frame_ie', | 203 'chrome_frame_ie', |
| 205 'chrome_frame_strings', | 204 'chrome_frame_strings', |
| 206 'chrome_frame_utils', | 205 'chrome_frame_utils', |
| 207 'chrome_tab_idl', | 206 'chrome_tab_idl', |
| 207 'locales/locales.gyp:*', |
| 208 'npchrome_frame', | 208 'npchrome_frame', |
| 209 ], | 209 ], |
| 210 'sources': [ | 210 'sources': [ |
| 211 '../base/test/test_suite.h', | 211 '../base/test/test_suite.h', |
| 212 'cfproxy_test.cc', | 212 'cfproxy_test.cc', |
| 213 'external_tab_test.cc', | 213 'external_tab_test.cc', |
| 214 'test/automation_client_mock.cc', | 214 'test/automation_client_mock.cc', |
| 215 'test/automation_client_mock.h', | 215 'test/automation_client_mock.h', |
| 216 'test/chrome_frame_test_utils.cc', | 216 'test/chrome_frame_test_utils.cc', |
| 217 'test/chrome_frame_test_utils.h', | 217 'test/chrome_frame_test_utils.h', |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 '../chrome/chrome.gyp:utility', | 304 '../chrome/chrome.gyp:utility', |
| 305 '../content/content.gyp:content_gpu', | 305 '../content/content.gyp:content_gpu', |
| 306 '../testing/gmock.gyp:gmock', | 306 '../testing/gmock.gyp:gmock', |
| 307 '../testing/gtest.gyp:gtest', | 307 '../testing/gtest.gyp:gtest', |
| 308 '../third_party/libxml/libxml.gyp:libxml', | 308 '../third_party/libxml/libxml.gyp:libxml', |
| 309 '../third_party/libxslt/libxslt.gyp:libxslt', | 309 '../third_party/libxslt/libxslt.gyp:libxslt', |
| 310 'chrome_frame_ie', | 310 'chrome_frame_ie', |
| 311 'chrome_frame_strings', | 311 'chrome_frame_strings', |
| 312 'chrome_frame_utils', | 312 'chrome_frame_utils', |
| 313 'chrome_tab_idl', | 313 'chrome_tab_idl', |
| 314 'locales/locales.gyp:*', |
| 314 'npchrome_frame', | 315 'npchrome_frame', |
| 315 ], | 316 ], |
| 316 'sources': [ | 317 'sources': [ |
| 317 '../base/test/perf_test_suite.h', | 318 '../base/test/perf_test_suite.h', |
| 318 '../base/perftimer.cc', | 319 '../base/perftimer.cc', |
| 319 '../base/test/test_file_util.h', | 320 '../base/test/test_file_util.h', |
| 320 '../chrome/test/base/chrome_process_util.cc', | 321 '../chrome/test/base/chrome_process_util.cc', |
| 321 '../chrome/test/base/chrome_process_util.h', | 322 '../chrome/test/base/chrome_process_util.h', |
| 322 '../chrome/test/ui/ui_test.cc', | 323 '../chrome/test/ui/ui_test.cc', |
| 323 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', | 324 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 '../chrome/chrome.gyp:browser', | 458 '../chrome/chrome.gyp:browser', |
| 458 '../chrome/chrome.gyp:debugger', | 459 '../chrome/chrome.gyp:debugger', |
| 459 '../chrome/chrome.gyp:renderer', | 460 '../chrome/chrome.gyp:renderer', |
| 460 '../chrome/chrome.gyp:test_support_common', | 461 '../chrome/chrome.gyp:test_support_common', |
| 461 '../content/content.gyp:content_gpu', | 462 '../content/content.gyp:content_gpu', |
| 462 '../testing/gmock.gyp:gmock', | 463 '../testing/gmock.gyp:gmock', |
| 463 '../testing/gtest.gyp:gtest', | 464 '../testing/gtest.gyp:gtest', |
| 464 'chrome_frame_ie', | 465 'chrome_frame_ie', |
| 465 'chrome_frame_strings', | 466 'chrome_frame_strings', |
| 466 'chrome_tab_idl', | 467 'chrome_tab_idl', |
| 468 'locales/locales.gyp:*', |
| 467 ], | 469 ], |
| 468 'sources': [ | 470 'sources': [ |
| 469 'test/reliability/run_all_unittests.cc', | 471 'test/reliability/run_all_unittests.cc', |
| 470 'test/reliability/page_load_test.cc', | 472 'test/reliability/page_load_test.cc', |
| 471 'test/reliability/page_load_test.h', | 473 'test/reliability/page_load_test.h', |
| 472 'test/reliability/reliability_test_suite.h', | 474 'test/reliability/reliability_test_suite.h', |
| 473 'test/chrome_frame_test_utils.cc', | 475 'test/chrome_frame_test_utils.cc', |
| 474 'test/chrome_frame_test_utils.h', | 476 'test/chrome_frame_test_utils.h', |
| 475 'test/ie_event_sink.cc', | 477 'test/ie_event_sink.cc', |
| 476 'test/ie_event_sink.h', | 478 'test/ie_event_sink.h', |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 'dependencies': [ | 527 'dependencies': [ |
| 526 '../base/base.gyp:test_support_base', | 528 '../base/base.gyp:test_support_base', |
| 527 '../build/temp_gyp/googleurl.gyp:googleurl', | 529 '../build/temp_gyp/googleurl.gyp:googleurl', |
| 528 '../net/net.gyp:net', | 530 '../net/net.gyp:net', |
| 529 '../net/net.gyp:net_test_support', | 531 '../net/net.gyp:net_test_support', |
| 530 '../testing/gmock.gyp:gmock', | 532 '../testing/gmock.gyp:gmock', |
| 531 '../testing/gtest.gyp:gtest', | 533 '../testing/gtest.gyp:gtest', |
| 532 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', | 534 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', |
| 533 'chrome_frame_ie', | 535 'chrome_frame_ie', |
| 534 'chrome_frame_strings', | 536 'chrome_frame_strings', |
| 537 'locales/locales.gyp:*', |
| 535 'npchrome_frame', | 538 'npchrome_frame', |
| 536 ], | 539 ], |
| 537 'sources': [ | 540 'sources': [ |
| 538 '../base/test/test_suite.h', | 541 '../base/test/test_suite.h', |
| 539 'test/chrome_frame_test_utils.cc', | 542 'test/chrome_frame_test_utils.cc', |
| 540 'test/chrome_frame_test_utils.h', | 543 'test/chrome_frame_test_utils.h', |
| 541 'test/chrome_frame_ui_test_utils.cc', | 544 'test/chrome_frame_ui_test_utils.cc', |
| 542 'test/chrome_frame_ui_test_utils.h', | 545 'test/chrome_frame_ui_test_utils.h', |
| 543 'test/external_sites_test.cc', | 546 'test/external_sites_test.cc', |
| 544 'test/ie_event_sink.cc', | 547 'test/ie_event_sink.cc', |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 593 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome_frame', | 596 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome_frame', |
| 594 }, | 597 }, |
| 595 'actions': [ | 598 'actions': [ |
| 596 { | 599 { |
| 597 'action_name': 'chrome_frame_resources', | 600 'action_name': 'chrome_frame_resources', |
| 598 'variables': { | 601 'variables': { |
| 599 'grit_grd_file': 'resources/chrome_frame_resources.grd', | 602 'grit_grd_file': 'resources/chrome_frame_resources.grd', |
| 600 }, | 603 }, |
| 601 'includes': [ '../build/grit_action.gypi' ], | 604 'includes': [ '../build/grit_action.gypi' ], |
| 602 }, | 605 }, |
| 606 { |
| 607 'action_name': 'chrome_frame_dialogs', |
| 608 'variables': { |
| 609 'grit_grd_file': 'resources/chrome_frame_dialogs.grd', |
| 610 }, |
| 611 'includes': [ '../build/grit_action.gypi' ], |
| 612 }, |
| 603 ], | 613 ], |
| 604 'includes': [ '../build/grit_target.gypi' ], | 614 'includes': [ '../build/grit_target.gypi' ], |
| 605 }, | 615 }, |
| 606 { | 616 { |
| 607 'target_name': 'chrome_frame_utils', | 617 'target_name': 'chrome_frame_utils', |
| 608 # The intent is that shared util code can be built into a separate lib. | 618 # The intent is that shared util code can be built into a separate lib. |
| 609 'type': 'static_library', | 619 'type': 'static_library', |
| 610 'dependencies': [ | 620 'dependencies': [ |
| 611 '../base/base.gyp:base_i18n', | 621 '../base/base.gyp:base_i18n', |
| 612 '../breakpad/breakpad.gyp:breakpad_handler', | 622 '../breakpad/breakpad.gyp:breakpad_handler', |
| (...skipping 11 matching lines...) Expand all Loading... |
| 624 ], | 634 ], |
| 625 }, | 635 }, |
| 626 { | 636 { |
| 627 'target_name': 'chrome_frame_ie', | 637 'target_name': 'chrome_frame_ie', |
| 628 'type': 'static_library', | 638 'type': 'static_library', |
| 629 'dependencies': [ | 639 'dependencies': [ |
| 630 'chrome_frame_common', | 640 'chrome_frame_common', |
| 631 'chrome_frame_strings', | 641 'chrome_frame_strings', |
| 632 'chrome_frame_utils', | 642 'chrome_frame_utils', |
| 633 'chrome_tab_idl', | 643 'chrome_tab_idl', |
| 644 'locales/locales.gyp:*', |
| 634 '../build/temp_gyp/googleurl.gyp:googleurl', | 645 '../build/temp_gyp/googleurl.gyp:googleurl', |
| 635 '../chrome/app/policy/cloud_policy_codegen.gyp:policy', | 646 '../chrome/app/policy/cloud_policy_codegen.gyp:policy', |
| 636 '../chrome/chrome.gyp:common', | 647 '../chrome/chrome.gyp:common', |
| 637 '../chrome/chrome.gyp:utility', | 648 '../chrome/chrome.gyp:utility', |
| 638 '../net/net.gyp:net', | 649 '../net/net.gyp:net', |
| 639 '../third_party/libxml/libxml.gyp:libxml', | 650 '../third_party/libxml/libxml.gyp:libxml', |
| 640 '../third_party/bzip2/bzip2.gyp:bzip2', | 651 '../third_party/bzip2/bzip2.gyp:bzip2', |
| 641 '../webkit/support/webkit_support.gyp:webkit_user_agent', | 652 '../webkit/support/webkit_support.gyp:webkit_user_agent', |
| 642 ], | 653 ], |
| 643 'sources': [ | 654 'sources': [ |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 822 { | 833 { |
| 823 'target_name': 'npchrome_frame', | 834 'target_name': 'npchrome_frame', |
| 824 'type': 'shared_library', | 835 'type': 'shared_library', |
| 825 'dependencies': [ | 836 'dependencies': [ |
| 826 '../base/base.gyp:base', | 837 '../base/base.gyp:base', |
| 827 'chrome_frame_ie', | 838 'chrome_frame_ie', |
| 828 'chrome_frame_strings', | 839 'chrome_frame_strings', |
| 829 'chrome_frame_utils', | 840 'chrome_frame_utils', |
| 830 'chrome_tab_idl', | 841 'chrome_tab_idl', |
| 831 'chrome_frame_launcher.gyp:chrome_launcher', | 842 'chrome_frame_launcher.gyp:chrome_launcher', |
| 832 '../build/temp_gyp/googleurl.gyp:googleurl', | |
| 833 'chrome_frame_launcher.gyp:chrome_frame_helper', | 843 'chrome_frame_launcher.gyp:chrome_frame_helper', |
| 834 'chrome_frame_launcher.gyp:chrome_frame_helper_dll', | 844 'chrome_frame_launcher.gyp:chrome_frame_helper_dll', |
| 845 'locales/locales.gyp:*', |
| 846 '../build/temp_gyp/googleurl.gyp:googleurl', |
| 835 '../chrome/chrome.gyp:chrome', | 847 '../chrome/chrome.gyp:chrome', |
| 836 '../chrome/chrome.gyp:chrome_dll', | 848 '../chrome/chrome.gyp:chrome_dll', |
| 837 '../chrome/chrome.gyp:chrome_version_resources', | 849 '../chrome/chrome.gyp:chrome_version_resources', |
| 838 '../chrome/chrome.gyp:common', | 850 '../chrome/chrome.gyp:common', |
| 839 ], | 851 ], |
| 840 'sources': [ | 852 'sources': [ |
| 841 'chrome_frame_elevation.rgs', | 853 'chrome_frame_elevation.rgs', |
| 842 'chrome_frame_reporting.cc', | 854 'chrome_frame_reporting.cc', |
| 843 'chrome_frame_reporting.h', | 855 'chrome_frame_reporting.h', |
| 844 'chrome_tab.cc', | 856 'chrome_tab.cc', |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1033 # Use outputs of this action as inputs for the main target build. | 1045 # Use outputs of this action as inputs for the main target build. |
| 1034 # Seems as a misnomer but makes this happy on Linux (scons). | 1046 # Seems as a misnomer but makes this happy on Linux (scons). |
| 1035 'process_outputs_as_sources': 1, | 1047 'process_outputs_as_sources': 1, |
| 1036 }, | 1048 }, |
| 1037 ], | 1049 ], |
| 1038 }, | 1050 }, |
| 1039 ], | 1051 ], |
| 1040 }, ], # 'coverage!=0' | 1052 }, ], # 'coverage!=0' |
| 1041 ], # 'conditions' | 1053 ], # 'conditions' |
| 1042 } | 1054 } |
| OLD | NEW |