Index: chrome/chrome_dll.gypi |
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi |
index 085dda991d5eaafa6699582e6a422058df1eac6c..58cb5539f32a0d609bb50e6a34bf2e7624344cac 100644 |
--- a/chrome/chrome_dll.gypi |
+++ b/chrome/chrome_dll.gypi |
@@ -112,6 +112,8 @@ |
'app/chrome_main.cc', |
'app/chrome_main_delegate.cc', |
'app/chrome_main_delegate.h', |
+ 'app/delay_load_hook_win.cc', |
+ 'app/delay_load_hook_win.h', |
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', |
'../base/win/dllmain.cc', |
@@ -169,6 +171,36 @@ |
'OutputFile': '$(OutDir)\\initial\\chrome.dll', |
'UseLibraryDependencyInputs': "true", |
}], |
+ ['target_arch=="ia32"', { |
+ # Link against the XP-constrained user32 import library |
+ # instead of the platform-SDK provided one to avoid |
+ # inadvertently taking dependencies on post-XP user32 |
+ # exports. |
+ 'AdditionalDependencies!': [ |
+ 'user32.lib', |
+ ], |
+ 'IgnoreDefaultLibraryNames': [ |
+ 'user32.lib', |
+ ], |
+ # Remove user32 delay load for chrome.dll. |
+ 'DelayLoadDLLs!': [ |
+ 'user32.dll', |
+ ], |
+ 'AdditionalDependencies': [ |
+ 'user32.winxp.lib', |
+ ], |
+ 'DelayLoadDLLs': [ |
+ 'user32-delay.dll', |
+ ], |
+ 'AdditionalLibraryDirectories': [ |
+ '<(DEPTH)/build/win/importlibs/x86', |
+ ], |
+ 'ForceSymbolReferences': [ |
+ # Force the inclusion of the delay load hook in this |
+ # binary. |
+ 'ChromeDelayLoadHook', |
+ ], |
+ }], |
], |
'DelayLoadDLLs': [ |
'comdlg32.dll', |