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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index b6027c0a4981bcfb6eafc205034b40287b0d2cce..920d4843c2fd327f3ecb7c07ec1c55454b12ce73 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -45,6 +45,13 @@
'platform_locale_settings_grd':
'app/resources/locale_settings_win.grd',
},],
+ ['OS=="win" and target_arch=="ia32"', {
+ # Add a dependency to custom import library for user32 delay imports
+ # only in x86 builds.
+ 'chromium_dependencies': [
+ 'chrome_user32_delay_imports',
+ ],
+ },],
['OS!="android" and OS!="ios"', {
'chromium_dependencies': [
# Android doesn't use the service process (only needed for print).
@@ -1035,6 +1042,27 @@
['OS=="win" and target_arch=="ia32"',
{ 'targets': [
{
+ 'target_name': 'chrome_user32_delay_imports',
+ 'type': 'none',
+ 'variables': {
+ 'lib_dir': '<(INTERMEDIATE_DIR)',
+ },
+ 'sources': [
+ 'chrome.user32.delay.imports'
+ ],
+ 'includes': [
+ '../build/win/importlibs/create_import_lib.gypi',
+ ],
+ 'direct_dependent_settings': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalLibraryDirectories': ['<(lib_dir)', ],
+ 'AdditionalDependencies': ['chrome.user32.delay.lib', ],
+ },
+ },
+ },
+ },
+ {
'target_name': 'crash_service_win64',
'type': 'executable',
'product_name': 'crash_service64',

Powered by Google App Engine
This is Rietveld 408576698