mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: upgrade to chromium 89.0.4336.0 * update patches * chore: use 'libvulkan.so.1' in the linux manifests CL: https://chromium-review.googlesource.com/c/angle/angle/+/2538430 Upstream renamed libvulkan.so to libvulkan.so.1, so sync our manifests. * chore: update expected window-open default policy. CL: https://chromium-review.googlesource.com/c/chromium/src/+/2429247 Upstream CL contiues the work to make `strict-origin-when-cross-origin` the default referrer policy. This commit changes our window-open tests to expect that policy over the previous `no-referrer-when-downgrade`. * chore: re-export chromium patches No code changes; just line numbers. `git am` failed because the upstream changes were just large enough to require patching to fail w/o fuzzing. The broken patch was patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch * update patches * update patches * fixup! chore: update expected window-open default policy. * chore: disallow copying CppHeapCreateParams Experimental commit to resolve FTBS https://ci.appveyor.com/project/electron-bot/electron-ljo26/builds/36405680#L25345 which introduces a new struct CppHeapCreateParams that aggregates a vector of unique_ptrs. Our Windows CI is unhappy that this struct implicitly deletes its copy ctor, so this commit makes it explicit. Xref: https://chromium-review.googlesource.com/c/v8/v8/+/2536642 * update patches * update patches * fixup! chore: bump chromium to ac06d6903a2c981ab90a8162f1ba0 (master) (#26499) * chore: update calls to gfx::RemoveAcceleratorChar. The call signature for gfx::RemoveAccelerator changed in https://chromium-review.googlesource.com/c/chromium/src/+/2546471 . This commit updates use to match that. * update patches * update patches * chore: update patches * Remove most service manifest remnants from Content https://chromium-review.googlesource.com/c/chromium/src/+/2296482 * Reland "Portals: Fix a11y for orphaned portals" https://chromium-review.googlesource.com/c/chromium/src/+/2542812 * Convert CallbackList::Subscription to a standalone class. https://chromium-review.googlesource.com/c/chromium/src/+/2522860 * fix: actually apply the zlib patch * chore: update patches * chore: update patches * clear out cache * Revert "clear out cache" This reverts commit 6e811fae4b7f4eeb736225ce2460857922763b66. * Update to 89.0.4342.2 * Remove force_ignore_site_for_cookies until we figure out what to do instead 2499162: Remove |force_ignore_site_for_cookies| from IPCs (e.g. ResourceRequest). | https://chromium-review.googlesource.com/c/chromium/src/+/2499162 (cherry picked from commit 102a2a3b8d57b6cddb85e9d24e44de77730c81c3) * Set site_for_cookies to request url so that URLLoader::ShouldForceIgnoreSiteForCookies returns true (cherry picked from commit 7a2510a9f68339a252a25df3839e9e215a476d4b) * 2485887: [Extensions][web_accessible_resources] Use |matches|. https://chromium-review.googlesource.com/c/chromium/src/+/2485887 (cherry picked from commit b67d89155d87c86aa295cda645fdee591dacd512) * 2490383: a11y inspect reorg: implement accessible tree formatter factory https://chromium-review.googlesource.com/c/chromium/src/+/2490383 (cherry picked from commit 8cd4ee013eec12205832d0f763ab4480cdb10c28) * Disable CertVerifierService for now 2559260: Enable CertVerifierService by default | https://chromium-review.googlesource.com/c/chromium/src/+/2559260 (cherry picked from commit 56a4a87dec21c1332e508adae4638bf00371dc73) * 2555005: [api] Simplify ScriptOrigin https://chromium-review.googlesource.com/c/v8/v8/+/2555005 (cherry picked from commit 338d4304bc9c0abcd24306aa4901558b9db9368b) * Actually apply nan patch (cherry picked from commit bf20236386f83229ec09c434d21aca4712d0d53b) * update patches * update to 89.0.4348.1 see if this resolves Windows crashes * Do not build MTLManagedObjectAdapter It's been removed in newer Mantle versions and uses a deprecated enum (cherry picked from commit 36accef04a9047da4f31f214f133866e48f7942c) * 2569367: Remove dead fullscreen code in RenderWidgetHostView and friends https://chromium-review.googlesource.com/c/chromium/src/+/2569367 (cherry picked from commit cab78df863acfb6ca24830eac8f9df11d7d877fd) * 2563553: Remove Flash from PermissionRequestTypes and PermissionTypes. https://chromium-review.googlesource.com/c/chromium/src/+/2563553 (cherry picked from commit d0ba1ec443e5ea234706ee93b5b413ed6c9095d7) * 2568359: mac: Ignore Wdeprecated-declarations for LSSharedFileList* functions. https://chromium-review.googlesource.com/c/chromium/src/+/2568359 (cherry picked from commit 1ca2fa5a3c7bd39419b50a439eb9eec4582ced28) * Remove deprecated performFileOperation usage (cherry picked from commit d2dca0c24950cbc81cec80beac9ba640e200d6fa) * 2546146: Remove browser-hosted InterfaceProvider https://chromium-review.googlesource.com/c/chromium/src/+/2546146 (cherry picked from commit 944da70791253e9a564317f93814ab544c944a8e) * fixup: Add disconnect logic to ElectronBrowserHandlerImpl (cherry picked from commit e4582a10bbdd20d08d94389953cad8a4ea2b7a1d) * 2561401: Add OutputPresenterX11 which uses X11 present extension. https://chromium-review.googlesource.com/c/chromium/src/+/2561401 (cherry picked from commit ef1d0164bdd8b730c51d46c3099d7d4efea0133b) * Allow local networking override for ATS https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html (cherry picked from commit f4a0b5834b78d189acb03d3b43b2160dcc749a7e) * 2565511: [objects] Remove MakeExternal case for uncached internal strings https://chromium-review.googlesource.com/c/v8/v8/+/2565511 (cherry picked from commitcf09a792f0) * Update patches after rebase * Refactor: clean up rfh getters in ElectronBrowserHandlerImpl (cherry picked from commitbe270753e1) * Remove unneeded BindTo (cherry picked from commitca3287895a) * Don't assign ElectronBrowserHandlerImpl at all (cherry picked from commit899ef067ed) * update patches Co-authored-by: Electron Bot <electron@github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
194 lines
5.4 KiB
Python
194 lines
5.4 KiB
Python
gclient_gn_args_file = 'src/build/config/gclient_args.gni'
|
|
gclient_gn_args = [
|
|
'build_with_chromium',
|
|
'checkout_android',
|
|
'checkout_android_native_support',
|
|
'checkout_libaom',
|
|
'checkout_nacl',
|
|
'checkout_pgo_profiles',
|
|
'checkout_oculus_sdk',
|
|
'checkout_openxr',
|
|
'checkout_google_benchmark',
|
|
'mac_xcode_version',
|
|
]
|
|
|
|
vars = {
|
|
'chromium_version':
|
|
'89.0.4348.1',
|
|
'node_version':
|
|
'v14.15.1',
|
|
'nan_version':
|
|
'2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
|
|
'squirrel.mac_version':
|
|
'cdc0729c8bf8576bfef18629186e1e9ecf1b0d9f',
|
|
|
|
'pyyaml_version': '3.12',
|
|
'requests_version': 'e4d59bedfd3c7f4f254f4f5d036587bcd8152458',
|
|
|
|
'chromium_git': 'https://chromium.googlesource.com',
|
|
'electron_git': 'https://github.com/electron',
|
|
'nodejs_git': 'https://github.com/nodejs',
|
|
'requests_git': 'https://github.com/kennethreitz',
|
|
'yaml_git': 'https://github.com/yaml',
|
|
'squirrel_git': 'https://github.com/Squirrel',
|
|
|
|
# KEEP IN SYNC WITH utils.js FILE
|
|
'yarn_version': '1.15.2',
|
|
|
|
# To be able to build clean Chromium from sources.
|
|
'apply_patches': True,
|
|
|
|
# To use an mtime cache for patched files to speed up builds.
|
|
'use_mtime_cache': True,
|
|
|
|
# To allow in-house builds to checkout those manually.
|
|
'checkout_chromium': True,
|
|
'checkout_node': True,
|
|
'checkout_nan': True,
|
|
'checkout_pgo_profiles': True,
|
|
|
|
# It's only needed to parse the native tests configurations.
|
|
'checkout_pyyaml': False,
|
|
|
|
# Python "requests" module is used for releases only.
|
|
'checkout_requests': False,
|
|
|
|
'mac_xcode_version': 'default',
|
|
|
|
# To allow running hooks without parsing the DEPS tree
|
|
'process_deps': True,
|
|
|
|
# It is always needed for normal Electron builds,
|
|
# but might be impossible for custom in-house builds.
|
|
'download_external_binaries': True,
|
|
|
|
'checkout_nacl':
|
|
False,
|
|
'checkout_libaom':
|
|
True,
|
|
'checkout_oculus_sdk':
|
|
False,
|
|
'checkout_openxr':
|
|
False,
|
|
'build_with_chromium':
|
|
True,
|
|
'checkout_android':
|
|
False,
|
|
'checkout_android_native_support':
|
|
False,
|
|
'checkout_google_benchmark':
|
|
False,
|
|
'checkout_clang_tidy':
|
|
True,
|
|
}
|
|
|
|
deps = {
|
|
'src': {
|
|
'url': (Var("chromium_git")) + '/chromium/src.git@' + (Var("chromium_version")),
|
|
'condition': 'checkout_chromium and process_deps',
|
|
},
|
|
'src/third_party/nan': {
|
|
'url': (Var("nodejs_git")) + '/nan.git@' + (Var("nan_version")),
|
|
'condition': 'checkout_nan and process_deps',
|
|
},
|
|
'src/third_party/electron_node': {
|
|
'url': (Var("nodejs_git")) + '/node.git@' + (Var("node_version")),
|
|
'condition': 'checkout_node and process_deps',
|
|
},
|
|
'src/electron/vendor/pyyaml': {
|
|
'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
|
|
'condition': 'checkout_pyyaml and process_deps',
|
|
},
|
|
'src/electron/vendor/requests': {
|
|
'url': Var('requests_git') + '/requests.git' + '@' + Var('requests_version'),
|
|
'condition': 'checkout_requests and process_deps',
|
|
},
|
|
'src/third_party/squirrel.mac': {
|
|
'url': Var("squirrel_git") + '/Squirrel.Mac.git@' + Var("squirrel.mac_version"),
|
|
'condition': 'process_deps',
|
|
},
|
|
'src/third_party/squirrel.mac/vendor/ReactiveObjC': {
|
|
'url': 'https://github.com/ReactiveCocoa/ReactiveObjC.git@74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76',
|
|
'condition': 'process_deps'
|
|
},
|
|
'src/third_party/squirrel.mac/vendor/Mantle': {
|
|
'url': 'https://github.com/Mantle/Mantle.git@78d3966b3c331292ea29ec38661b25df0a245948',
|
|
'condition': 'process_deps',
|
|
}
|
|
}
|
|
|
|
pre_deps_hooks = [
|
|
{
|
|
'name': 'generate_mtime_cache',
|
|
'condition': '(checkout_chromium and apply_patches and use_mtime_cache) and process_deps',
|
|
'pattern': 'src/electron',
|
|
'action': [
|
|
'python3',
|
|
'src/electron/script/patches-mtime-cache.py',
|
|
'generate',
|
|
'--cache-file',
|
|
'src/electron/patches/mtime-cache.json',
|
|
'--patches-config',
|
|
'src/electron/patches/config.json',
|
|
],
|
|
},
|
|
]
|
|
|
|
hooks = [
|
|
{
|
|
'name': 'patch_chromium',
|
|
'condition': '(checkout_chromium and apply_patches) and process_deps',
|
|
'pattern': 'src/electron',
|
|
'action': [
|
|
'python3',
|
|
'src/electron/script/apply_all_patches.py',
|
|
'src/electron/patches/config.json',
|
|
],
|
|
},
|
|
{
|
|
'name': 'apply_mtime_cache',
|
|
'condition': '(checkout_chromium and apply_patches and use_mtime_cache) and process_deps',
|
|
'pattern': 'src/electron',
|
|
'action': [
|
|
'python3',
|
|
'src/electron/script/patches-mtime-cache.py',
|
|
'apply',
|
|
'--cache-file',
|
|
'src/electron/patches/mtime-cache.json',
|
|
],
|
|
},
|
|
{
|
|
'name': 'electron_external_binaries',
|
|
'pattern': 'src/electron/script/update-external-binaries.py',
|
|
'condition': 'download_external_binaries',
|
|
'action': [
|
|
'python3',
|
|
'src/electron/script/update-external-binaries.py',
|
|
],
|
|
},
|
|
{
|
|
'name': 'electron_npm_deps',
|
|
'pattern': 'src/electron/package.json',
|
|
'action': [
|
|
'python3',
|
|
'-c',
|
|
'import os, subprocess; os.chdir(os.path.join("src", "electron")); subprocess.check_call(["python", "script/lib/npx.py", "yarn@' + (Var("yarn_version")) + '", "install", "--frozen-lockfile"]);',
|
|
],
|
|
},
|
|
{
|
|
'name': 'setup_requests',
|
|
'pattern': 'src/electron',
|
|
'condition': 'checkout_requests and process_deps',
|
|
'action': [
|
|
'python3',
|
|
'-c',
|
|
'import os, subprocess; os.chdir(os.path.join("src", "electron", "vendor", "requests")); subprocess.check_call(["python", "setup.py", "build"]);',
|
|
],
|
|
},
|
|
]
|
|
|
|
recursedeps = [
|
|
'src',
|
|
'src/third_party/squirrel.mac',
|
|
]
|