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

Side by Side Diff: trunk/src/chrome/chrome.gyp

Issue 13208002: Revert 191173 "Check in a custom-built import library for user32..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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
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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 'browser/safe_browsing/signature_util.h', 1033 'browser/safe_browsing/signature_util.h',
1034 'browser/safe_browsing/signature_util_win.cc', 1034 'browser/safe_browsing/signature_util_win.cc',
1035 'tools/safe_browsing/sb_sigutil.cc', 1035 'tools/safe_browsing/sb_sigutil.cc',
1036 ], 1036 ],
1037 }, 1037 },
1038 ]}, # 'targets' 1038 ]}, # 'targets'
1039 ], # OS=="win" 1039 ], # OS=="win"
1040 ['OS=="win" and target_arch=="ia32"', 1040 ['OS=="win" and target_arch=="ia32"',
1041 { 'targets': [ 1041 { 'targets': [
1042 { 1042 {
1043 'target_name': 'chrome_user32_delay_imports',
1044 'type': 'none',
1045 'variables': {
1046 'lib_dir': '<(INTERMEDIATE_DIR)',
1047 },
1048 'sources': [
1049 'chrome.user32.delay.imports'
1050 ],
1051 'includes': [
1052 '../build/win/importlibs/create_import_lib.gypi',
1053 ],
1054 'direct_dependent_settings': {
1055 'msvs_settings': {
1056 'VCLinkerTool': {
1057 'AdditionalLibraryDirectories': ['<(lib_dir)', ],
1058 'AdditionalDependencies': ['chrome.user32.delay.lib', ],
1059 },
1060 },
1061 },
1062 },
1063 {
1064 'target_name': 'crash_service_win64', 1043 'target_name': 'crash_service_win64',
1065 'type': 'executable', 1044 'type': 'executable',
1066 'product_name': 'crash_service64', 1045 'product_name': 'crash_service64',
1067 'dependencies': [ 1046 'dependencies': [
1068 'installer_util_nacl_win64', 1047 'installer_util_nacl_win64',
1069 '../base/base.gyp:base_static_win64', 1048 '../base/base.gyp:base_static_win64',
1070 '../breakpad/breakpad.gyp:breakpad_handler_win64', 1049 '../breakpad/breakpad.gyp:breakpad_handler_win64',
1071 '../breakpad/breakpad.gyp:breakpad_sender_win64', 1050 '../breakpad/breakpad.gyp:breakpad_sender_win64',
1072 '../chrome/common_constants.gyp:common_constants_win64', 1051 '../chrome/common_constants.gyp:common_constants_win64',
1073 ], 1052 ],
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 '../build/java.gypi', 1111 '../build/java.gypi',
1133 ], 1112 ],
1134 }, 1113 },
1135 ], # 'targets' 1114 ], # 'targets'
1136 'includes': [ 1115 'includes': [
1137 'chrome_android.gypi', 1116 'chrome_android.gypi',
1138 ]}, # 'includes' 1117 ]}, # 'includes'
1139 ], # OS=="android" 1118 ], # OS=="android"
1140 ], # 'conditions' 1119 ], # 'conditions'
1141 } 1120 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/app/delay_load_hook_win.cc ('k') | trunk/src/chrome/chrome.user32.delay.imports » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698