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

Side by Side Diff: chrome_frame/chrome_frame.gyp

Issue 15421002: Roll DEPS for googleurl. Second try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome_frame_ie fix Created 7 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/chrome_tests.gypi ('k') | chromeos/chromeos.gyp » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # Keep the archive builder happy. 9 # Keep the archive builder happy.
10 'chrome_personalization%': 1, 10 'chrome_personalization%': 1,
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 }, 207 },
208 }, 208 },
209 }], 209 }],
210 ], 210 ],
211 }, 211 },
212 { 212 {
213 'target_name': 'chrome_frame_tests', 213 'target_name': 'chrome_frame_tests',
214 'type': 'executable', 214 'type': 'executable',
215 'dependencies': [ 215 'dependencies': [
216 '../base/base.gyp:test_support_base', 216 '../base/base.gyp:test_support_base',
217 '../build/temp_gyp/googleurl.gyp:googleurl', 217 '../chrome/chrome.gyp:browser',
218 '../chrome/chrome.gyp:common', 218 '../chrome/chrome.gyp:common',
219 '../chrome/chrome.gyp:utility',
220 '../chrome/chrome.gyp:browser',
221 '../chrome/chrome.gyp:debugger', 219 '../chrome/chrome.gyp:debugger',
222 '../chrome/chrome.gyp:renderer', 220 '../chrome/chrome.gyp:renderer',
223 '../chrome/chrome.gyp:test_support_common', 221 '../chrome/chrome.gyp:test_support_common',
222 '../chrome/chrome.gyp:utility',
224 '../chrome/installer/upgrade_test.gyp:alternate_version_generator_lib', 223 '../chrome/installer/upgrade_test.gyp:alternate_version_generator_lib',
225 '../content/content.gyp:content_gpu', 224 '../content/content.gyp:content_gpu',
226 '../net/net.gyp:net', 225 '../net/net.gyp:net',
227 '../net/net.gyp:net_test_support', 226 '../net/net.gyp:net_test_support',
228 '../testing/gmock.gyp:gmock', 227 '../testing/gmock.gyp:gmock',
229 '../testing/gtest.gyp:gtest', 228 '../testing/gtest.gyp:gtest',
229 '../third_party/iaccessible2/iaccessible2.gyp:IAccessible2Proxy',
230 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 230 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
231 '../third_party/iaccessible2/iaccessible2.gyp:IAccessible2Proxy',
232 '../third_party/libxslt/libxslt.gyp:libxslt', 231 '../third_party/libxslt/libxslt.gyp:libxslt',
232 '../url/url.gyp:url_lib',
233 'chrome_frame_ie', 233 'chrome_frame_ie',
234 'chrome_frame_strings', 234 'chrome_frame_strings',
235 'chrome_frame_utils', 235 'chrome_frame_utils',
236 'chrome_tab_idl', 236 'chrome_tab_idl',
237 'locales/locales.gyp:*', 237 'locales/locales.gyp:*',
238 'npchrome_frame', 238 'npchrome_frame',
239 ], 239 ],
240 'sources': [ 240 'sources': [
241 '../base/test/test_suite.h', 241 '../base/test/test_suite.h',
242 'test/automation_client_mock.cc', 242 'test/automation_client_mock.cc',
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 }], 321 }],
322 ], 322 ],
323 }, 323 },
324 { 324 {
325 'target_name': 'chrome_frame_perftests', 325 'target_name': 'chrome_frame_perftests',
326 'type': 'executable', 326 'type': 'executable',
327 'dependencies': [ 327 'dependencies': [
328 '../base/base.gyp:base', 328 '../base/base.gyp:base',
329 '../base/base.gyp:base_i18n', 329 '../base/base.gyp:base_i18n',
330 '../base/base.gyp:test_support_base', 330 '../base/base.gyp:test_support_base',
331 '../build/temp_gyp/googleurl.gyp:googleurl', 331 '../chrome/chrome.gyp:browser',
332 '../chrome/chrome.gyp:common', 332 '../chrome/chrome.gyp:common',
333 '../chrome/chrome.gyp:browser',
334 '../chrome/chrome.gyp:debugger', 333 '../chrome/chrome.gyp:debugger',
335 '../chrome/chrome.gyp:image_pre_reader', 334 '../chrome/chrome.gyp:image_pre_reader',
336 '../chrome/chrome.gyp:test_support_common', 335 '../chrome/chrome.gyp:test_support_common',
337 '../chrome/chrome.gyp:test_support_ui', 336 '../chrome/chrome.gyp:test_support_ui',
338 '../chrome/chrome.gyp:utility', 337 '../chrome/chrome.gyp:utility',
339 '../content/content.gyp:content_gpu', 338 '../content/content.gyp:content_gpu',
340 '../testing/gmock.gyp:gmock', 339 '../testing/gmock.gyp:gmock',
341 '../testing/gtest.gyp:gtest', 340 '../testing/gtest.gyp:gtest',
342 '../third_party/libxml/libxml.gyp:libxml', 341 '../third_party/libxml/libxml.gyp:libxml',
343 '../third_party/libxslt/libxslt.gyp:libxslt', 342 '../third_party/libxslt/libxslt.gyp:libxslt',
343 '../url/url.gyp:url_lib',
344 'chrome_frame_ie', 344 'chrome_frame_ie',
345 'chrome_frame_strings', 345 'chrome_frame_strings',
346 'chrome_frame_utils', 346 'chrome_frame_utils',
347 'chrome_tab_idl', 347 'chrome_tab_idl',
348 'locales/locales.gyp:*', 348 'locales/locales.gyp:*',
349 'npchrome_frame', 349 'npchrome_frame',
350 ], 350 ],
351 'sources': [ 351 'sources': [
352 '../base/test/perf_test_suite.h', 352 '../base/test/perf_test_suite.h',
353 '../base/perftimer.cc', 353 '../base/perftimer.cc',
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 }, 555 },
556 }, 556 },
557 }], 557 }],
558 ], 558 ],
559 }, 559 },
560 { 560 {
561 'target_name': 'chrome_frame_qa_tests', 561 'target_name': 'chrome_frame_qa_tests',
562 'type': 'executable', 562 'type': 'executable',
563 'dependencies': [ 563 'dependencies': [
564 '../base/base.gyp:test_support_base', 564 '../base/base.gyp:test_support_base',
565 '../build/temp_gyp/googleurl.gyp:googleurl',
566 '../chrome/chrome.gyp:test_support_common', 565 '../chrome/chrome.gyp:test_support_common',
567 '../net/net.gyp:net', 566 '../net/net.gyp:net',
568 '../net/net.gyp:net_test_support', 567 '../net/net.gyp:net_test_support',
569 '../testing/gmock.gyp:gmock', 568 '../testing/gmock.gyp:gmock',
570 '../testing/gtest.gyp:gtest', 569 '../testing/gtest.gyp:gtest',
571 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 570 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
572 '../third_party/protobuf/protobuf.gyp:protobuf_lite', 571 '../third_party/protobuf/protobuf.gyp:protobuf_lite',
572 '../url/url.gyp:url_lib',
573 'chrome_frame_ie', 573 'chrome_frame_ie',
574 'chrome_frame_strings', 574 'chrome_frame_strings',
575 'chrome_tab_idl', 575 'chrome_tab_idl',
576 'locales/locales.gyp:*', 576 'locales/locales.gyp:*',
577 'npchrome_frame', 577 'npchrome_frame',
578 ], 578 ],
579 'sources': [ 579 'sources': [
580 '../base/test/test_suite.h', 580 '../base/test/test_suite.h',
581 'test/chrome_frame_test_utils.cc', 581 'test/chrome_frame_test_utils.cc',
582 'test/chrome_frame_test_utils.h', 582 'test/chrome_frame_test_utils.h',
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 'crash_server_init.cc', 671 'crash_server_init.cc',
672 'crash_server_init.h', 672 'crash_server_init.h',
673 'simple_resource_loader.cc', 673 'simple_resource_loader.cc',
674 'simple_resource_loader.h', 674 'simple_resource_loader.h',
675 ], 675 ],
676 }, 676 },
677 { 677 {
678 'target_name': 'chrome_frame_ie', 678 'target_name': 'chrome_frame_ie',
679 'type': 'static_library', 679 'type': 'static_library',
680 'dependencies': [ 680 'dependencies': [
681 'chrome_frame_common',
682 'chrome_frame_strings',
683 'chrome_frame_utils',
684 'chrome_tab_idl',
685 'locales/locales.gyp:*',
686 '../build/temp_gyp/googleurl.gyp:googleurl',
687 '../chrome/app/policy/cloud_policy_codegen.gyp:policy', 681 '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
688 '../chrome/chrome.gyp:common', 682 '../chrome/chrome.gyp:common',
689 '../chrome/chrome.gyp:utility', 683 '../chrome/chrome.gyp:utility',
690 '../content/content.gyp:content_common', 684 '../content/content.gyp:content_common',
691 '../net/net.gyp:net', 685 '../net/net.gyp:net',
692 '../third_party/libxml/libxml.gyp:libxml', 686 '../third_party/libxml/libxml.gyp:libxml',
687 '../url/url.gyp:url_lib',
693 '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', 688 '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
689 'chrome_frame_common',
690 'chrome_frame_strings',
691 'chrome_frame_utils',
692 'chrome_tab_idl',
693 'locales/locales.gyp:*',
694 ], 694 ],
695 'sources': [ 695 'sources': [
696 'bho.cc', 696 'bho.cc',
697 'bho.h', 697 'bho.h',
698 'bho.rgs', 698 'bho.rgs',
699 'bind_context_info.cc', 699 'bind_context_info.cc',
700 'bind_context_info.h', 700 'bind_context_info.h',
701 'bind_status_callback_impl.cc', 701 'bind_status_callback_impl.cc',
702 'bind_status_callback_impl.h', 702 'bind_status_callback_impl.h',
703 'buggy_bho_handling.cc', 703 'buggy_bho_handling.cc',
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 ], 869 ],
870 'export_dependent_settings': [ 870 'export_dependent_settings': [
871 '../base/base.gyp:base', 871 '../base/base.gyp:base',
872 ], 872 ],
873 }, 873 },
874 { 874 {
875 'target_name': 'npchrome_frame', 875 'target_name': 'npchrome_frame',
876 'type': 'shared_library', 876 'type': 'shared_library',
877 'dependencies': [ 877 'dependencies': [
878 '../base/base.gyp:base', 878 '../base/base.gyp:base',
879 '../chrome/chrome.gyp:chrome',
880 '../chrome/chrome.gyp:chrome_dll',
881 '../chrome/chrome.gyp:chrome_version_resources',
882 '../chrome/chrome.gyp:common',
883 '../url/url.gyp:url_lib',
879 'chrome_frame_ie', 884 'chrome_frame_ie',
885 'chrome_frame_launcher.gyp:chrome_frame_helper',
886 'chrome_frame_launcher.gyp:chrome_frame_helper_dll',
887 'chrome_frame_launcher.gyp:chrome_launcher',
880 'chrome_frame_strings', 888 'chrome_frame_strings',
881 'chrome_frame_utils', 889 'chrome_frame_utils',
882 'chrome_frame_version_resources', 890 'chrome_frame_version_resources',
883 'chrome_tab_idl', 891 'chrome_tab_idl',
884 'chrome_frame_launcher.gyp:chrome_launcher',
885 'chrome_frame_launcher.gyp:chrome_frame_helper',
886 'chrome_frame_launcher.gyp:chrome_frame_helper_dll',
887 'locales/locales.gyp:*', 892 'locales/locales.gyp:*',
888 '../build/temp_gyp/googleurl.gyp:googleurl',
889 '../chrome/chrome.gyp:chrome',
890 '../chrome/chrome.gyp:chrome_dll',
891 '../chrome/chrome.gyp:chrome_version_resources',
892 '../chrome/chrome.gyp:common',
893 ], 893 ],
894 'defines': [ 894 'defines': [
895 '_WINDLL', 895 '_WINDLL',
896 ], 896 ],
897 'sources': [ 897 'sources': [
898 'chrome_frame_elevation.rgs', 898 'chrome_frame_elevation.rgs',
899 'chrome_frame_reporting.cc', 899 'chrome_frame_reporting.cc',
900 'chrome_frame_reporting.h', 900 'chrome_frame_reporting.h',
901 'chrome_tab.cc', 901 'chrome_tab.cc',
902 'chrome_tab.def', 902 'chrome_tab.def',
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1083 # Use outputs of this action as inputs for the main target build. 1083 # Use outputs of this action as inputs for the main target build.
1084 # Seems as a misnomer but makes this happy on Linux (scons). 1084 # Seems as a misnomer but makes this happy on Linux (scons).
1085 'process_outputs_as_sources': 1, 1085 'process_outputs_as_sources': 1,
1086 }, 1086 },
1087 ], 1087 ],
1088 }, 1088 },
1089 ], 1089 ],
1090 }, ], # 'coverage!=0' 1090 }, ], # 'coverage!=0'
1091 ], # 'conditions' 1091 ], # 'conditions'
1092 } 1092 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chromeos/chromeos.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698