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

Side by Side Diff: chrome_frame/chrome_frame.gyp

Issue 5259007: Undo removal of chrome_dll_version from r67457. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to head Created 10 years 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') | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)', 8 'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)',
9 9
10 'variables': { 10 'variables': {
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 }, 491 },
492 'msvs_settings': { 492 'msvs_settings': {
493 'VCLinkerTool': { 493 'VCLinkerTool': {
494 'DelayLoadDLLs': ['prntvpt.dll'], 494 'DelayLoadDLLs': ['prntvpt.dll'],
495 }, 495 },
496 }, 496 },
497 'dependencies': [ 497 'dependencies': [
498 '../breakpad/breakpad.gyp:breakpad_handler', 498 '../breakpad/breakpad.gyp:breakpad_handler',
499 '../chrome/chrome.gyp:automation', 499 '../chrome/chrome.gyp:automation',
500 '../chrome/chrome.gyp:crash_service', 500 '../chrome/chrome.gyp:crash_service',
501 '../chrome/chrome.gyp:chrome_version_header', 501 '../chrome/chrome.gyp:chrome_dll_version',
502 '../chrome/chrome.gyp:installer_util', 502 '../chrome/chrome.gyp:installer_util',
503 '../google_update/google_update.gyp:google_update', 503 '../google_update/google_update.gyp:google_update',
504 ], 504 ],
505 'configurations': { 505 'configurations': {
506 'Debug_Base': { 506 'Debug_Base': {
507 'msvs_settings': { 507 'msvs_settings': {
508 'VCLinkerTool': { 508 'VCLinkerTool': {
509 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 509 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
510 }, 510 },
511 }, 511 },
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
862 'chrome_frame_strings', 862 'chrome_frame_strings',
863 'chrome_frame_utils', 863 'chrome_frame_utils',
864 'chrome_tab_idl', 864 'chrome_tab_idl',
865 'xulrunner_sdk', 865 'xulrunner_sdk',
866 'chrome_frame_launcher.gyp:chrome_launcher', 866 'chrome_frame_launcher.gyp:chrome_launcher',
867 '../build/temp_gyp/googleurl.gyp:googleurl', 867 '../build/temp_gyp/googleurl.gyp:googleurl',
868 'chrome_frame_launcher.gyp:chrome_frame_helper', 868 'chrome_frame_launcher.gyp:chrome_frame_helper',
869 'chrome_frame_launcher.gyp:chrome_frame_helper_dll', 869 'chrome_frame_launcher.gyp:chrome_frame_helper_dll',
870 '../chrome/chrome.gyp:chrome', 870 '../chrome/chrome.gyp:chrome',
871 '../chrome/chrome.gyp:chrome_dll', 871 '../chrome/chrome.gyp:chrome_dll',
872 '../chrome/chrome.gyp:chrome_version_header', 872 '../chrome/chrome.gyp:chrome_dll_version',
873 '../chrome/chrome.gyp:common', 873 '../chrome/chrome.gyp:common',
874 '../chrome/chrome.gyp:utility', 874 '../chrome/chrome.gyp:utility',
875 ], 875 ],
876 'sources': [ 876 'sources': [
877 'chrome_frame_npapi.rgs', 877 'chrome_frame_npapi.rgs',
878 'chrome_frame_npapi_entrypoints.cc', 878 'chrome_frame_npapi_entrypoints.cc',
879 'chrome_frame_npapi_entrypoints.h', 879 'chrome_frame_npapi_entrypoints.h',
880 'chrome_frame_reporting.cc', 880 'chrome_frame_reporting.cc',
881 'chrome_frame_reporting.h', 881 'chrome_frame_reporting.h',
882 'chrome_tab.cc', 882 'chrome_tab.cc',
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 ], # 'conditions' 1075 ], # 'conditions'
1076 } 1076 }
1077 1077
1078 # vim: shiftwidth=2:et:ai:tabstop=2 1078 # vim: shiftwidth=2:et:ai:tabstop=2
1079 1079
1080 # Local Variables: 1080 # Local Variables:
1081 # tab-width:2 1081 # tab-width:2
1082 # indent-tabs-mode:nil 1082 # indent-tabs-mode:nil
1083 # End: 1083 # End:
1084 # vim: set expandtab tabstop=2 shiftwidth=2: 1084 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698