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

Side by Side Diff: chrome/chrome.gyp

Issue 12295040: Stop delay loading user32.dll from chrome.dll on x86/Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reduce scope to chrome.dll/x86. Address review comments. Created 7 years, 9 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 27 matching lines...) Expand all
38 }], 38 }],
39 ['OS=="win"', { 39 ['OS=="win"', {
40 'nacl_defines': [ 40 'nacl_defines': [
41 'NACL_WINDOWS=1', 41 'NACL_WINDOWS=1',
42 'NACL_LINUX=0', 42 'NACL_LINUX=0',
43 'NACL_OSX=0', 43 'NACL_OSX=0',
44 ], 44 ],
45 'platform_locale_settings_grd': 45 'platform_locale_settings_grd':
46 'app/resources/locale_settings_win.grd', 46 'app/resources/locale_settings_win.grd',
47 },], 47 },],
48 ['OS=="win" and target_arch=="ia32"', {
49 # Add a dependency to custom import library for user32 delay imports
50 # only in x86 builds.
51 'chromium_dependencies': [
52 'chrome_user32_delay_imports',
53 ],
54 },],
48 ['OS!="android" and OS!="ios"', { 55 ['OS!="android" and OS!="ios"', {
49 'chromium_dependencies': [ 56 'chromium_dependencies': [
50 # Android doesn't use the service process (only needed for print). 57 # Android doesn't use the service process (only needed for print).
51 'service', 58 'service',
52 ], 59 ],
53 }], 60 }],
54 ['OS=="linux"', { 61 ['OS=="linux"', {
55 'nacl_defines': [ 62 'nacl_defines': [
56 'NACL_WINDOWS=0', 63 'NACL_WINDOWS=0',
57 'NACL_LINUX=1', 64 'NACL_LINUX=1',
(...skipping 970 matching lines...) Expand 10 before | Expand all | Expand 10 after
1028 'browser/safe_browsing/signature_util.h', 1035 'browser/safe_browsing/signature_util.h',
1029 'browser/safe_browsing/signature_util_win.cc', 1036 'browser/safe_browsing/signature_util_win.cc',
1030 'tools/safe_browsing/sb_sigutil.cc', 1037 'tools/safe_browsing/sb_sigutil.cc',
1031 ], 1038 ],
1032 }, 1039 },
1033 ]}, # 'targets' 1040 ]}, # 'targets'
1034 ], # OS=="win" 1041 ], # OS=="win"
1035 ['OS=="win" and target_arch=="ia32"', 1042 ['OS=="win" and target_arch=="ia32"',
1036 { 'targets': [ 1043 { 'targets': [
1037 { 1044 {
1045 'target_name': 'chrome_user32_delay_imports',
1046 'type': 'none',
1047 'variables': {
1048 'lib_dir': '<(INTERMEDIATE_DIR)',
1049 },
1050 'sources': [
1051 'chrome.user32.delay.imports'
1052 ],
1053 'includes': [
1054 '../build/win/importlibs/create_import_lib.gypi',
1055 ],
1056 'direct_dependent_settings': {
1057 'msvs_settings': {
1058 'VCLinkerTool': {
1059 'AdditionalLibraryDirectories': ['<(lib_dir)', ],
1060 'AdditionalDependencies': ['chrome.user32.delay.lib', ],
1061 },
1062 },
1063 },
1064 },
1065 {
1038 'target_name': 'crash_service_win64', 1066 'target_name': 'crash_service_win64',
1039 'type': 'executable', 1067 'type': 'executable',
1040 'product_name': 'crash_service64', 1068 'product_name': 'crash_service64',
1041 'dependencies': [ 1069 'dependencies': [
1042 'installer_util_nacl_win64', 1070 'installer_util_nacl_win64',
1043 '../base/base.gyp:base_static_win64', 1071 '../base/base.gyp:base_static_win64',
1044 '../breakpad/breakpad.gyp:breakpad_handler_win64', 1072 '../breakpad/breakpad.gyp:breakpad_handler_win64',
1045 '../breakpad/breakpad.gyp:breakpad_sender_win64', 1073 '../breakpad/breakpad.gyp:breakpad_sender_win64',
1046 '../chrome/common_constants.gyp:common_constants_win64', 1074 '../chrome/common_constants.gyp:common_constants_win64',
1047 ], 1075 ],
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 '../build/java.gypi', 1127 '../build/java.gypi',
1100 ], 1128 ],
1101 }, 1129 },
1102 ], # 'targets' 1130 ], # 'targets'
1103 'includes': [ 1131 'includes': [
1104 'chrome_android.gypi', 1132 'chrome_android.gypi',
1105 ]}, # 'includes' 1133 ]}, # 'includes'
1106 ], # OS=="android" 1134 ], # OS=="android"
1107 ], # 'conditions' 1135 ], # 'conditions'
1108 } 1136 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698