Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Ensure electron delay loads the same modules as chromium #25436

Merged
merged 3 commits into from Sep 14, 2020
Merged

fix: Ensure electron delay loads the same modules as chromium #25436

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d68ce0
Ensure electron delay loads the appropriate modules as chromium on wi…
chrdavis Sep 11, 2020
06fe446
fix: Ensure win modules are properly delayloaded
chrdavis Sep 11, 2020
1aa7c52
chore: fix linting
MarshallOfSound Sep 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 5 additions & 8 deletions BUILD.gn
View file
Open in desktop
Expand Up @@ -1138,20 +1138,17 @@ if (is_mac) {
"//components/crash/core/app:run_as_crashpad_handler",
]

ldflags = []

libs = [
"comctl32.lib",
"uiautomationcore.lib",
"wtsapi32.lib",
]

configs += [ "//build/config/win:windowed" ]

ldflags = [
# Windows 7 doesn't have these DLLs.
# TODO: are there other DLLs we need to list here to be win7
# compatible?
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-string-l1-1-0.dll",
configs += [
"//build/config/win:windowed",
"//build/config/win:delayloads",
]

# This is to support renaming of electron.exe. node-gyp has hard-coded
Expand Down