diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/build/win | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/build/win')
| -rw-r--r-- | chromium/build/win/BUILD.gn | 6 | ||||
| -rw-r--r-- | chromium/build/win/segment_heap.manifest | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/chromium/build/win/BUILD.gn b/chromium/build/win/BUILD.gn index 9be769fd075..d449f592519 100644 --- a/chromium/build/win/BUILD.gn +++ b/chromium/build/win/BUILD.gn @@ -79,6 +79,7 @@ if (is_win) { "$root_out_dir/cdb/api-ms-win-crt-string-l1-1-0.dll", "$root_out_dir/cdb/api-ms-win-crt-time-l1-1-0.dll", "$root_out_dir/cdb/api-ms-win-crt-utility-l1-1-0.dll", + "$root_out_dir/cdb/api-ms-win-downlevel-kernel32-l2-1-0.dll", "$root_out_dir/cdb/api-ms-win-eventing-provider-l1-1-0.dll", "$root_out_dir/cdb/ucrtbase.dll", ] @@ -108,6 +109,9 @@ if (is_win) { "$root_out_dir/vccorlib140${vcrt_suffix}.dll", "$root_out_dir/vcruntime140${vcrt_suffix}.dll", ] + if (current_cpu == "x64") { + data += [ "$root_out_dir/vcruntime140_1${vcrt_suffix}.dll" ] + } if (is_debug) { data += [ "$root_out_dir/ucrtbased.dll" ] } @@ -159,6 +163,8 @@ if (is_win) { "$root_out_dir/api-ms-win-crt-string-l1-1-0.dll", "$root_out_dir/api-ms-win-crt-time-l1-1-0.dll", "$root_out_dir/api-ms-win-crt-utility-l1-1-0.dll", + "$root_out_dir/api-ms-win-downlevel-kernel32-l2-1-0.dll", + "$root_out_dir/api-ms-win-eventing-provider-l1-1-0.dll", ] if (!is_debug) { data += [ "$root_out_dir/ucrtbase.dll" ] diff --git a/chromium/build/win/segment_heap.manifest b/chromium/build/win/segment_heap.manifest new file mode 100644 index 00000000000..fc930a4d563 --- /dev/null +++ b/chromium/build/win/segment_heap.manifest @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <heapType xmlns="http://schemas.microsoft.com/SMI/2020/WindowsSettings">SegmentHeap</heapType> + </windowsSettings> + </application> +</assembly> |