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

Side by Side Diff: chrome_frame/chrome_frame.gyp

Issue 7056049: Changes to have chrome building with net.dll (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/service/cloud_print/print_system_win.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 'direct_dependent_settings': { 71 'direct_dependent_settings': {
72 'include_dirs': ['<(SHARED_INTERMEDIATE_DIR)'], 72 'include_dirs': ['<(SHARED_INTERMEDIATE_DIR)'],
73 }, 73 },
74 }, 74 },
75 { 75 {
76 'target_name': 'chrome_frame_unittests', 76 'target_name': 'chrome_frame_unittests',
77 'type': 'executable', 77 'type': 'executable',
78 'dependencies': [ 78 'dependencies': [
79 '../base/base.gyp:test_support_base', 79 '../base/base.gyp:test_support_base',
80 '../chrome/app/policy/cloud_policy_codegen.gyp:policy', 80 '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
81 '../net/net.gyp:net',
81 '../testing/gmock.gyp:gmock', 82 '../testing/gmock.gyp:gmock',
82 '../testing/gtest.gyp:gtest', 83 '../testing/gtest.gyp:gtest',
83 'chrome_frame_launcher.gyp:chrome_frame_helper_lib', 84 'chrome_frame_launcher.gyp:chrome_frame_helper_lib',
84 'chrome_frame_ie', 85 'chrome_frame_ie',
85 'chrome_frame_strings', 86 'chrome_frame_strings',
86 'chrome_tab_idl', 87 'chrome_tab_idl',
87 ], 88 ],
88 'sources': [ 89 'sources': [
89 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 90 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
90 'chrome_frame_histograms.h', 91 'chrome_frame_histograms.h',
(...skipping 18 matching lines...) Expand all
109 'test/registry_watcher_unittest.cc', 110 'test/registry_watcher_unittest.cc',
110 'test/simulate_input.h', 111 'test/simulate_input.h',
111 'test/simulate_input.cc', 112 'test/simulate_input.cc',
112 'test/urlmon_moniker_tests.h', 113 'test/urlmon_moniker_tests.h',
113 'test/urlmon_moniker_unittest.cc', 114 'test/urlmon_moniker_unittest.cc',
114 'test/util_unittests.cc', 115 'test/util_unittests.cc',
115 'test/win_event_receiver.h', 116 'test/win_event_receiver.h',
116 'test/win_event_receiver.cc', 117 'test/win_event_receiver.cc',
117 'unittest_precompile.h', 118 'unittest_precompile.h',
118 'unittest_precompile.cc', 119 'unittest_precompile.cc',
119 'urlmon_upload_data_stream.cc',
120 'urlmon_upload_data_stream_unittest.cc', 120 'urlmon_upload_data_stream_unittest.cc',
121 'vtable_patch_manager_unittest.cc', 121 'vtable_patch_manager_unittest.cc',
122 ], 122 ],
123 'include_dirs': [ 123 'include_dirs': [
124 ], 124 ],
125 'resource_include_dirs': [ 125 'resource_include_dirs': [
126 '<(INTERMEDIATE_DIR)', 126 '<(INTERMEDIATE_DIR)',
127 '<(SHARED_INTERMEDIATE_DIR)', 127 '<(SHARED_INTERMEDIATE_DIR)',
128 ], 128 ],
129 'conditions': [ 129 'conditions': [
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 '../base/base.gyp:test_support_base', 195 '../base/base.gyp:test_support_base',
196 '../build/temp_gyp/googleurl.gyp:googleurl', 196 '../build/temp_gyp/googleurl.gyp:googleurl',
197 '../chrome/chrome.gyp:chrome_version_header', 197 '../chrome/chrome.gyp:chrome_version_header',
198 '../chrome/chrome.gyp:common', 198 '../chrome/chrome.gyp:common',
199 '../chrome/chrome.gyp:utility', 199 '../chrome/chrome.gyp:utility',
200 '../chrome/chrome.gyp:browser', 200 '../chrome/chrome.gyp:browser',
201 '../chrome/chrome.gyp:debugger', 201 '../chrome/chrome.gyp:debugger',
202 '../chrome/chrome.gyp:renderer', 202 '../chrome/chrome.gyp:renderer',
203 '../chrome/installer/upgrade_test.gyp:alternate_version_generator_lib', 203 '../chrome/installer/upgrade_test.gyp:alternate_version_generator_lib',
204 '../content/content.gyp:content_gpu', 204 '../content/content.gyp:content_gpu',
205 '../net/net.gyp:net',
205 '../net/net.gyp:net_test_support', 206 '../net/net.gyp:net_test_support',
206 '../testing/gmock.gyp:gmock', 207 '../testing/gmock.gyp:gmock',
207 '../testing/gtest.gyp:gtest', 208 '../testing/gtest.gyp:gtest',
208 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 209 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
209 '../third_party/iaccessible2/iaccessible2.gyp:IAccessible2Proxy', 210 '../third_party/iaccessible2/iaccessible2.gyp:IAccessible2Proxy',
210 '../third_party/libxslt/libxslt.gyp:libxslt', 211 '../third_party/libxslt/libxslt.gyp:libxslt',
211 'chrome_frame_ie', 212 'chrome_frame_ie',
212 'chrome_frame_npapi', 213 'chrome_frame_npapi',
213 'chrome_frame_strings', 214 'chrome_frame_strings',
214 'chrome_frame_utils', 215 'chrome_frame_utils',
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 'msvs_guid': '8FDA8275-0415-4B08-A1DC-C95B0D3708DB', 382 'msvs_guid': '8FDA8275-0415-4B08-A1DC-C95B0D3708DB',
382 'type': 'executable', 383 'type': 'executable',
383 'dependencies': [ 384 'dependencies': [
384 '../base/base.gyp:test_support_base', 385 '../base/base.gyp:test_support_base',
385 '../chrome/chrome.gyp:browser', 386 '../chrome/chrome.gyp:browser',
386 '../chrome/chrome.gyp:chrome_resources', 387 '../chrome/chrome.gyp:chrome_resources',
387 '../chrome/chrome.gyp:debugger', 388 '../chrome/chrome.gyp:debugger',
388 '../chrome/chrome.gyp:renderer', 389 '../chrome/chrome.gyp:renderer',
389 '../chrome/chrome.gyp:syncapi_core', 390 '../chrome/chrome.gyp:syncapi_core',
390 '../content/content.gyp:content_gpu', 391 '../content/content.gyp:content_gpu',
392 '../net/net.gyp:net',
391 '../net/net.gyp:net_test_support', 393 '../net/net.gyp:net_test_support',
392 '../skia/skia.gyp:skia', 394 '../skia/skia.gyp:skia',
393 '../testing/gtest.gyp:gtest', 395 '../testing/gtest.gyp:gtest',
394 '../third_party/icu/icu.gyp:icui18n', 396 '../third_party/icu/icu.gyp:icui18n',
395 '../third_party/icu/icu.gyp:icuuc', 397 '../third_party/icu/icu.gyp:icuuc',
396 'chrome_frame_npapi', 398 'chrome_frame_npapi',
397 'chrome_frame_ie', 399 'chrome_frame_ie',
398 'chrome_tab_idl', 400 'chrome_tab_idl',
399 'npchrome_frame', 401 'npchrome_frame',
400 ], 402 ],
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 }], 528 }],
527 ], 529 ],
528 }, 530 },
529 { 531 {
530 'target_name': 'chrome_frame_qa_tests', 532 'target_name': 'chrome_frame_qa_tests',
531 'msvs_guid': 'D6B3174D-31DD-49D6-83C0-A63A6A135E0E', 533 'msvs_guid': 'D6B3174D-31DD-49D6-83C0-A63A6A135E0E',
532 'type': 'executable', 534 'type': 'executable',
533 'dependencies': [ 535 'dependencies': [
534 '../base/base.gyp:test_support_base', 536 '../base/base.gyp:test_support_base',
535 '../build/temp_gyp/googleurl.gyp:googleurl', 537 '../build/temp_gyp/googleurl.gyp:googleurl',
538 '../net/net.gyp:net',
536 '../net/net.gyp:net_test_support', 539 '../net/net.gyp:net_test_support',
537 '../testing/gmock.gyp:gmock', 540 '../testing/gmock.gyp:gmock',
538 '../testing/gtest.gyp:gtest', 541 '../testing/gtest.gyp:gtest',
539 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 542 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
540 'chrome_frame_ie', 543 'chrome_frame_ie',
541 'chrome_frame_npapi', 544 'chrome_frame_npapi',
542 'chrome_frame_strings', 545 'chrome_frame_strings',
543 'npchrome_frame', 546 'npchrome_frame',
544 ], 547 ],
545 'sources': [ 548 'sources': [
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 }, 609 },
607 { 610 {
608 'target_name': 'chrome_frame_npapi', 611 'target_name': 'chrome_frame_npapi',
609 'type': 'static_library', 612 'type': 'static_library',
610 'dependencies': [ 613 'dependencies': [
611 'chrome_frame_common', 614 'chrome_frame_common',
612 'chrome_frame_npapi_core', 615 'chrome_frame_npapi_core',
613 'chrome_frame_strings', 616 'chrome_frame_strings',
614 'chrome_frame_utils', 617 'chrome_frame_utils',
615 '../chrome/chrome.gyp:common', 618 '../chrome/chrome.gyp:common',
619 '../net/net.gyp:net',
616 ], 620 ],
617 'sources': [ 621 'sources': [
618 'chrome_frame_npapi.cc', 622 'chrome_frame_npapi.cc',
619 'chrome_frame_npapi.h', 623 'chrome_frame_npapi.h',
620 'np_utils.cc', 624 'np_utils.cc',
621 'np_utils.h', 625 'np_utils.h',
622 'npapi_url_request.cc', 626 'npapi_url_request.cc',
623 'npapi_url_request.h', 627 'npapi_url_request.h',
624 ], 628 ],
625 'include_dirs': [ 629 'include_dirs': [
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 ], 668 ],
665 }, 669 },
666 { 670 {
667 'target_name': 'chrome_frame_ie', 671 'target_name': 'chrome_frame_ie',
668 'type': 'static_library', 672 'type': 'static_library',
669 'dependencies': [ 673 'dependencies': [
670 'chrome_frame_common', 674 'chrome_frame_common',
671 'chrome_frame_strings', 675 'chrome_frame_strings',
672 'chrome_frame_utils', 676 'chrome_frame_utils',
673 'chrome_tab_idl', 677 'chrome_tab_idl',
678 '../build/temp_gyp/googleurl.gyp:googleurl',
679 '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
674 '../chrome/chrome.gyp:common', 680 '../chrome/chrome.gyp:common',
675 '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
676 '../chrome/chrome.gyp:utility', 681 '../chrome/chrome.gyp:utility',
677 '../build/temp_gyp/googleurl.gyp:googleurl', 682 '../net/net.gyp:net',
678 '../third_party/libxml/libxml.gyp:libxml', 683 '../third_party/libxml/libxml.gyp:libxml',
679 '../third_party/bzip2/bzip2.gyp:bzip2', 684 '../third_party/bzip2/bzip2.gyp:bzip2',
680 '../webkit/support/webkit_support.gyp:webkit_user_agent', 685 '../webkit/support/webkit_support.gyp:webkit_user_agent',
681 ], 686 ],
682 'sources': [ 687 'sources': [
683 'bho.cc', 688 'bho.cc',
684 'bho.h', 689 'bho.h',
685 'bho.rgs', 690 'bho.rgs',
686 'bind_context_info.cc', 691 'bind_context_info.cc',
687 'bind_context_info.h', 692 'bind_context_info.h',
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 'navigation_constraints.cc', 852 'navigation_constraints.cc',
848 'plugin_url_request.h', 853 'plugin_url_request.h',
849 'plugin_url_request.cc', 854 'plugin_url_request.cc',
850 'sync_msg_reply_dispatcher.h', 855 'sync_msg_reply_dispatcher.h',
851 'sync_msg_reply_dispatcher.cc', 856 'sync_msg_reply_dispatcher.cc',
852 'task_marshaller.h', 857 'task_marshaller.h',
853 'task_marshaller.cc', 858 'task_marshaller.cc',
854 ], 859 ],
855 'dependencies': [ 860 'dependencies': [
856 '../base/base.gyp:base', 861 '../base/base.gyp:base',
862 '../net/net.gyp:net',
857 ], 863 ],
858 'export_dependent_settings': [ 864 'export_dependent_settings': [
859 '../base/base.gyp:base', 865 '../base/base.gyp:base',
860 ], 866 ],
861 }, 867 },
862 { 868 {
863 'target_name': 'npchrome_frame', 869 'target_name': 'npchrome_frame',
864 'type': 'shared_library', 870 'type': 'shared_library',
865 'msvs_guid': 'E3DE7E63-D3B6-4A9F-BCC4-5C8169E9C9F2', 871 'msvs_guid': 'E3DE7E63-D3B6-4A9F-BCC4-5C8169E9C9F2',
866 'dependencies': [ 872 'dependencies': [
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
1086 ], # 'conditions' 1092 ], # 'conditions'
1087 } 1093 }
1088 1094
1089 # vim: shiftwidth=2:et:ai:tabstop=2 1095 # vim: shiftwidth=2:et:ai:tabstop=2
1090 1096
1091 # Local Variables: 1097 # Local Variables:
1092 # tab-width:2 1098 # tab-width:2
1093 # indent-tabs-mode:nil 1099 # indent-tabs-mode:nil
1094 # End: 1100 # End:
1095 # vim: set expandtab tabstop=2 shiftwidth=2: 1101 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/service/cloud_print/print_system_win.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698