Bug 1271886 - Move netapi32 to delay load DLLs. r=ted

netapi32's API isn't used at startup and browsing page.  So netapi32 should move to delay load DLLs.

MozReview-Commit-ID: 1g25lnuwbfY

--HG--
extra : rebase_source : 7893ff80d10d3f0fd25aabe5c5fbaebe167e89fe
This commit is contained in:
Makoto Kato 2016-05-11 20:05:25 +09:00
Родитель 77f6ee4369
Коммит 62b8fa4250
3 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

@ -25,6 +25,7 @@ LOCAL_INCLUDES += [
if CONFIG['OS_ARCH'] == 'WINNT':
OS_LIBS += [
'esent',
'netapi32',
'ole32',
'shell32',
'shlwapi',
@ -32,6 +33,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
]
DELAYLOAD_DLLS += [
'esent.dll',
'netapi32.dll',
]
# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)

Просмотреть файл

@ -1328,7 +1328,7 @@ case "$target" in
# Use temp file for windres (bug 213281)
RCFLAGS='-O coff --use-temp-file'
# mingw doesn't require kernel32, user32, and advapi32 explicitly
LIBS="$LIBS -luuid -lgdi32 -lwinmm -lwsock32 -luserenv -lsecur32 -lnetapi32"
LIBS="$LIBS -luuid -lgdi32 -lwinmm -lwsock32 -luserenv -lsecur32"
MOZ_FIX_LINK_PATHS=
DLL_PREFIX=
IMPORT_LIB_SUFFIX=a
@ -1484,7 +1484,7 @@ case "$target" in
# make 'foo == bar;' error out
CFLAGS="$CFLAGS -we4553"
CXXFLAGS="$CXXFLAGS -we4553"
LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib secur32.lib netapi32.lib"
LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib secur32.lib"
MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
WARNINGS_AS_ERRORS='-WX'
MOZ_OPTIMIZE_FLAGS='-O1 -Oi'

Просмотреть файл

@ -18,6 +18,7 @@ def Libxul(name):
DELAYLOAD_DLLS += [
'comdlg32.dll',
'dbghelp.dll',
'netapi32.dll',
'PowrProf.dll',
'psapi.dll',
'rasapi32.dll',
@ -337,6 +338,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
'comdlg32',
'imm32',
'msimg32',
'netapi32',
'shlwapi',
'psapi',
'ws2_32',