mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
2ce64944ab
* chore: bump chromium in DEPS to 520c02b46668fc608927e0fcd79b6a90885a48bf
* chore: bump chromium in DEPS to 90.0.4414.0
* resolve chromium conflicts
* resolve v8 conflicts
* fix node gn files
* 2673502: Remove RenderViewCreated use from ExtensionHost.
https://chromium-review.googlesource.com/c/chromium/src/+/2673502
* 2676903: [mojo] Remove most legacy Binding classes.
https://chromium-review.googlesource.com/c/chromium/src/+/2676903
* 2644847: Move self-deleting URLLoaderFactory base into //services/network.
https://chromium-review.googlesource.com/c/chromium/src/+/2644847
* 2664006: Remove from mojo::DataPipe.
https://chromium-review.googlesource.com/c/chromium/src/+/2664006
* 2674530: Remove CertVerifierService feature
https://chromium-review.googlesource.com/c/chromium/src/+/2674530
* 2668748: Move OnSSLCertificateError to a new interface.
https://chromium-review.googlesource.com/c/chromium/src/+/2668748
* 2672923: Remove RAPPOR reporting infrastructure.
https://chromium-review.googlesource.com/c/chromium/src/+/2672923
* 2673502: Remove RenderViewCreated use from ExtensionHost.
https://chromium-review.googlesource.com/c/chromium/src/+/2673502
* 2655126: Convert FrameHostMsg_ContextMenu and FrameMsg_ContextMenuClosed|CustomContextMenuAction to Mojo
https://chromium-review.googlesource.com/c/chromium/src/+/2655126
* 2628705: Window Placement: Implement screen.isExtended and change event
https://chromium-review.googlesource.com/c/chromium/src/+/2628705
* 2643161: Refactor storage::kFileSystem*Native*
https://chromium-review.googlesource.com/c/chromium/src/+/2643161
* fix build
* only remove the biggest subdir of //ios
* chore: bump chromium in DEPS to 90.0.4415.0
* update patches
* update sysroots
* 2686147: Remove WebContentsObserver::RenderViewCreated().
https://chromium-review.googlesource.com/c/chromium/src/+/2686147
* 2596429: Fixing how extension's split and spanning modes affect OriginAccessList.
https://chromium-review.googlesource.com/c/chromium/src/+/2596429
* 2686026: [mojo] Delete AssociatedInterfacePtr (replaced by AssociatedRemote)
https://chromium-review.googlesource.com/c/chromium/src/+/2686026
* 2651705: Move ui/base/dragdrop/file_info to ui/base/clipboard
https://chromium-review.googlesource.com/c/chromium/src/+/2651705
* 358217: drawBitmap is deprecated
https://skia-review.googlesource.com/c/skia/+/358217
* fix gn check
* 2678098: Use gen/front_end as input to generate_devtools_grd
https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2678098
* 2674530: Remove CertVerifierService feature
https://chromium-review.googlesource.com/c/chromium/src/+/2674530
* fixup 2664006: Remove from mojo::DataPipe.
https://chromium-review.googlesource.com/c/chromium/src/+/2664006
* fixup build_add_electron_tracing_category.patch
* 2673415: [base] Prepare CrashReporterClient for string16 switch
https://chromium-review.googlesource.com/c/chromium/src/+/2673415
* 2673413: Add CursorFactoryWin to handle Cursors on Windows
https://chromium-review.googlesource.com/c/chromium/src/+/2673413
* 2668748: Move OnSSLCertificateError to a new interface.
https://chromium-review.googlesource.com/c/chromium/src/+/2668748
* fix mas gn check
* update patch after merge
* Update node for .mjs files
* build: load v8_prof_processor dependencies as ESM
* chore: add patch to fix linux 32bit
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
(cherry picked from commit ca75bca667)
Co-authored-by: Electron Bot <electron@github.com>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: John Kleinschmidt <jkleinsc@github.com>
|
|
Date: Wed, 15 Jul 2020 17:52:32 -0400
|
|
Subject: skip atk toolchain check
|
|
|
|
this patch is needed to work around the following gn error on
|
|
Linux arm/arm64:
|
|
|
|
ERROR at //build/config/linux/atk/BUILD.gn:13:1: Assertion failed.
|
|
|
|
assert(current_toolchain == default_toolchain)
|
|
|
|
^-----
|
|
|
|
See //ui/accessibility/BUILD.gn:297:20: which caused the file to be included.
|
|
|
|
configs += [ "//build/config/linux/atk" ]
|
|
|
|
^-------------------------
|
|
"//build/config/linux/atk" is only needed for accessibility unit tests
|
|
which we don't build
|
|
|
|
diff --git a/build/config/linux/atk/BUILD.gn b/build/config/linux/atk/BUILD.gn
|
|
index bc8e27894732a6d3e834d6b21f00441eca02dd63..f7381c1d5b5842521e0c35476ae468ab508c0fea 100644
|
|
--- a/build/config/linux/atk/BUILD.gn
|
|
+++ b/build/config/linux/atk/BUILD.gn
|
|
@@ -12,7 +12,7 @@ import("//build/config/ui.gni")
|
|
assert(!is_chromeos_ash)
|
|
|
|
# These packages should _only_ be expected when building for a target.
|
|
-assert(current_toolchain == default_toolchain)
|
|
+#assert(current_toolchain == default_toolchain)
|
|
|
|
if (use_atk) {
|
|
assert(use_glib, "use_atk=true requires that use_glib=true")
|