e012801420
* Update to Chromium 68.0.3440.128 and Node 10.10.0
* update v8, ffmpeg, chromium, crashpad, boringssl, and webrtc patches
* fix SSL_get_tlsext_status_type patch
* pass encryption_modes_supported to CdmInfo
* kNoSandbox moved into service_manager
* bump CHROME_VERSION_STRING
TODO: automatically pull in the real chrome version
* PathService -> base::PathService
* net::X509Certificate::Equals -> net::X509Certificate::EqualsExcludingChain
* use content::ChildProcessTerminationInfo
* GetHandle() -> GetProcess().Handle()
* ScopedNestableTaskAllower doesn't take an argument
* net::HttpAuthCache::ClearEntriesAddedWithin -> ClearAllEntries
* std::unique_ptr<WebContents>
* blink::WebFullscreenOptions
* OnAudioStateChanged doesn't take a WebContents
* content::RESULT_CODE_NORMAL_EXIT -> service_manager::RESULT_CODE_NORMAL_EXIT
* MessageLoopCurrent
* WasResized -> SynchronizeVisualProperties
* SetTimeStamp takes a base::TimeTicks
* ExecuteScriptInIsolatedWorld is single-script only
* DispatchNonPersistentCloseEvent takes a callback now
* expose URLRequestContextGetter::{Add,Remove}Observer
* test: remove no longer existing Chromium test deps
cc_blink_unittests has been removed in
https://chromium-review.googlesource.com/1053765
mojo_common_unittests has been removed in
https://chromium-review.googlesource.com/1028000
* SetFdLimit -> IncreaseFdLimitTo
NOTE: the behaviour of this API has changed slightly, and we should
mention that in the notes.
* MessageLoop::QuitWhenIdleClosure -> RunLoop::QuitCurrentWhenIdleClosureDeprecated
* certificate_transparency moved out of net/
pending a clearer decision about what to do with CT
in the mean time, copy CreateLogVerifiersForKnownLogs from deleted chromium source
* add secure_origin_whitelist to chrome source list
NOTE: is this something we actually want? cc @deepak1556
* DrainBackgroundTasks -> DrainTasks
* use new node options parser
* fix disable_scroll_begin_dcheck.patch
* ViewsDelegate::CreateWebContents went away
see 1031314
* kZygoteProcess moved into service_manager
* test: minor improvements to the Node spec
- reformat some parts
- better failures reporting with `expect`
- skip some tests instead of marking them as passed
* chromium removed *_posix.cc from the source filters
* test: fix :electron_tests compilation
* better crash diagnostics in ffmpeg test
* fix: enable back a DCHECK in viz::ServerSharedBitmapManager
Fixes #14327.
Backports https://chromium-review.googlesource.com/802574.
* chore: update linux sysroots
* chore: remove obsolete "install-sysroot.py" script
* test: fix frame-subscriber test on Mac
* disable OSR for now
* test: make before-input-event test more robust
* test: make run-as-node --inspect test more robust on windows
* roll node to v10.11.0
* avoid duplicate files when building a zip
* disable failing assert in beginFrameSubscription dirty-rectangle test
* experiment with is_cfi = false
* fix: build torque with x64 toolchain
Co-Authored-By: Alexey Kuzmin <github@alexeykuzmin.com>
* test: disable the "app.relaunch" test on Linux
* chore: bump node to get header tar file
* chore: bump node to fix tar.py line endings
60 lines
3 KiB
Diff
60 lines
3 KiB
Diff
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
|
|
index 4d9d1f45f870..286c791613ba 100644
|
|
--- a/build/toolchain/win/BUILD.gn
|
|
+++ b/build/toolchain/win/BUILD.gn
|
|
@@ -154,6 +154,12 @@ template("msvc_toolchain") {
|
|
]
|
|
|
|
command = "$env_wrapper$cl /nologo /showIncludes ${clflags} $sys_include_flags{{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} /c {{source}} /Fo{{output}} /Fd\"$pdbname\""
|
|
+
|
|
+ if (is_electron_build && !is_component_build) {
|
|
+ pdbdir = "{{target_out_dir}}"
|
|
+ pdbname = "{{label_name}}_c.pdb"
|
|
+ command = "$python_path $tool_wrapper_path cl-wrapper $env_wrapper$cl /nologo /showIncludes ${clflags} $sys_include_flags{{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} /c {{source}} /Fo{{output}} $pdbdir \"$pdbname\""
|
|
+ }
|
|
}
|
|
|
|
tool("cxx") {
|
|
@@ -170,6 +176,12 @@ template("msvc_toolchain") {
|
|
]
|
|
|
|
command = "$env_wrapper$cl /nologo /showIncludes ${clflags} $sys_include_flags{{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} /c {{source}} /Fo{{output}} /Fd\"$pdbname\""
|
|
+
|
|
+ if (is_electron_build && !is_component_build) {
|
|
+ pdbdir = "{{target_out_dir}}"
|
|
+ pdbname = "{{label_name}}_cc.pdb"
|
|
+ command = "$python_path $tool_wrapper_path cl-wrapper $env_wrapper$cl /nologo /showIncludes ${clflags} $sys_include_flags{{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} /c {{source}} /Fo{{output}} $pdbdir \"$pdbname\""
|
|
+ }
|
|
}
|
|
|
|
tool("rc") {
|
|
diff --git a/build/toolchain/win/tool_wrapper.py b/build/toolchain/win/tool_wrapper.py
|
|
index b2cb093377ee..801d7a9b8e03 100644
|
|
--- a/build/toolchain/win/tool_wrapper.py
|
|
+++ b/build/toolchain/win/tool_wrapper.py
|
|
@@ -270,6 +270,25 @@ class WinTool(object):
|
|
dirname = dirname[0] if dirname else None
|
|
return subprocess.call(args, shell=True, env=env, cwd=dirname)
|
|
|
|
+ def ExecClWrapper(self, *args):
|
|
+ """Invokes cl.exe to compile a C/C++ source file."""
|
|
+ args = list(args)
|
|
+ # Incorporate the PDB output dir into the PDB name to ensure the PDB name
|
|
+ # is unique (see https://github.com/electron/libchromiumcontent/issues/287)
|
|
+ pdb_name = args.pop()
|
|
+ pdb_dir = args.pop()
|
|
+ pdb_filename = '%s/%s_%s' % (pdb_dir, pdb_dir.replace('/', '_'), pdb_name)
|
|
+ # On Windows when args is a sequence instead of a single string
|
|
+ # subprocess.call() will use subprocess.list2cmdline() to convert the
|
|
+ # sequence to a string. Unfortunately the double-quote escaping done by
|
|
+ # subprocess.list2cmdline() mangles the /Fd"path/to/some.pdb" arg to
|
|
+ # /Fd\"path/to/some.pdb\", and cl.exe then fails to parse the PDB filename
|
|
+ # correctly. To work around this we use subprocess.list2cmdline()
|
|
+ # (even though it's not part of the public API) to construct most of the
|
|
+ # command line, and then append the /Fd flag.
|
|
+ pdb_flag = '/Fd"%s"' % pdb_filename
|
|
+ cmdline = '%s %s' % (subprocess.list2cmdline(args), pdb_flag)
|
|
+ return subprocess.call(cmdline, shell=False)
|
|
|
|
if __name__ == '__main__':
|
|
sys.exit(main(sys.argv[1:]))
|