mirror of
https://github.com/electron/electron.git
synced 2026-01-09 07:28:12 -05:00
310490221e
* chore: bump chromium in DEPS to 144.0.7500.0
* chore: fixup patch indices
* 7088768: Reland "download reclient only for chromeos by default"
https://chromium-review.googlesource.com/c/chromium/src/+/7088768
* Revert "7088768: Reland "download reclient only for chromeos by default""
This reverts commit 149d9fc92e.
* build: explicitly disable reclient
* 7013355: [api] Remove deprecated PropertyCallbackInfo::Holder()
https://chromium-review.googlesource.com/c/v8/v8/+/7013355
* [video pip] Enable video picture-in-picture controls update
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6701399
* fixup! [api] Remove deprecated PropertyCallbackInfo::Holder()
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
23 lines
819 B
Diff
23 lines
819 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Mon, 1 Jun 2020 15:30:47 -0800
|
|
Subject: fix: export zlib symbols
|
|
|
|
This patch sets ZLIB_DLL so that we properly export zlib symbols.
|
|
|
|
diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn
|
|
index afd3e8cc0f38e95b3b04835b46bd1197a63b4ed1..652fa32d49de9f0c73777c0d4d99421f52e16b38 100644
|
|
--- a/third_party/zlib/BUILD.gn
|
|
+++ b/third_party/zlib/BUILD.gn
|
|
@@ -333,6 +333,10 @@ component("zlib") {
|
|
defines = []
|
|
deps = []
|
|
|
|
+ if (is_win) {
|
|
+ defines += [ "ZLIB_DLL" ]
|
|
+ }
|
|
+
|
|
if (!use_x86_x64_optimizations && !use_arm_neon_optimizations) {
|
|
# Apparently android_cronet bot builds with NEON disabled and
|
|
# we also should disable optimizations for iOS@x86 (a.k.a. simulator).
|