Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump chromium to f30828899e4cd7161f6dc6507023f (master) #20824

Merged
merged 36 commits into from
Nov 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
c9146e0
chore: bump chromium in DEPS to 0476932294da8809a19189b9f54cee11d50cc512
electron-bot Oct 29, 2019
b849084
update chromium patches (#20838)
nornagon Oct 29, 2019
6a0660e
chore: bump chromium in DEPS to 838863f5ec9e8a12132a10bb47be8382ad9756a7
electron-bot Oct 30, 2019
4ef9da2
IsRendererTransferNeededForNavigation went away
nornagon Oct 29, 2019
ac71831
[arraybuffer] Move the ArrayBuffer implementation from wtf to core
nornagon Oct 29, 2019
fd6d873
URLLoaderRequest new mojo types
nornagon Oct 30, 2019
a341aac
context menu enums moved around
nornagon Oct 30, 2019
d81d1fe
chore: bump chromium in DEPS to dc9525d251bf30828899e4cd7161f6dc6507023f
electron-bot Oct 30, 2019
98d203b
update chromium patches
nornagon Oct 30, 2019
696225e
[WIP] Convert network hints IPC to Mojo
nornagon Oct 30, 2019
e798b63
jumbo build is no longer supported
nornagon Oct 30, 2019
bf4a2c5
fix disable-color-correct-rendering
nornagon Oct 30, 2019
59d5bd0
[FIXME] fix printing patch
nornagon Oct 30, 2019
28f7b09
explicitly include ax_enums
nornagon Oct 30, 2019
ba45db7
fixup! [WIP] Convert network hints IPC to Mojo
nornagon Oct 30, 2019
a5e7857
fix base::span
nornagon Oct 31, 2019
c181f8c
fix AsarURLLoader to not double-std::move
nornagon Oct 31, 2019
72a0f1a
fix debug build
nornagon Oct 31, 2019
8d94931
fix msstl patch
nornagon Oct 31, 2019
ee57157
lint
nornagon Oct 31, 2019
85a166e
more fix msstl
nornagon Oct 31, 2019
cda2c9d
mooooore fix msstl
nornagon Oct 31, 2019
870b7a7
fix compile
nornagon Oct 31, 2019
ec84624
update backport_fix_msstl_compat_in_ui_events.patch
nornagon Nov 1, 2019
b89fb86
update msstl compat patch
nornagon Nov 1, 2019
34f1324
don't try to build chrome's prefetch predictor
nornagon Nov 1, 2019
2edb838
build: fix compilation on windows
deepak1556 Nov 1, 2019
fcc01f7
Fixup patches for MAS build
Nov 4, 2019
dd25f4f
Free up disk space for mac debug builds
Nov 4, 2019
6944127
fix: apply custom site instance only for main frame
deepak1556 Nov 4, 2019
1100eb5
Fixup from rebase
Nov 5, 2019
6507624
Try not generating symbols for mac debug builds
Nov 5, 2019
2024fa8
Remove double entry of patch
Nov 5, 2019
ac718e2
FIx compile errors
Nov 5, 2019
1db294a
Trigger CI
Nov 5, 2019
063b4ee
Set symbol_level to 1 for mac debug builds
Nov 5, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ env-debug-build: &env-debug-build
GN_CONFIG: //electron/build/args/debug.gn
SKIP_DIST_ZIP: '1'

env-mac-debug-build: &env-mac-debug-build
# Set symbol level to 1 so that debug builds do not run out of disk space
GN_BUILDFLAG_ARGS: 'symbol_level = 1'

env-testing-build: &env-testing-build
GN_CONFIG: //electron/build/args/testing.gn
CHECK_DIST_MANIFEST: '1'
Expand Down Expand Up @@ -246,6 +250,12 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
command: |
if [ "`uname`" == "Darwin" ]; then
sudo rm -rf /Library/Developer/CoreSimulator
sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform
sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform
sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/WatchOS.platform
sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/WatchSimulator.platform
sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform
sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform
fi

step-delete-git-directories: &step-delete-git-directories
Expand Down Expand Up @@ -1590,6 +1600,7 @@ jobs:
environment:
<<: *env-mac-large
<<: *env-debug-build
<<: *env-mac-debug-build
<<: *env-enable-sccache
<<: *env-ninja-status
<<: *steps-electron-build
Expand Down Expand Up @@ -1652,6 +1663,7 @@ jobs:
<<: *env-mac-large
<<: *env-mas
<<: *env-debug-build
<<: *env-mac-debug-build
<<: *env-enable-sccache
<<: *env-ninja-status
<<: *steps-electron-build
Expand Down
3 changes: 2 additions & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,8 @@ source_set("electron_lib") {
"//components/certificate_transparency",
"//components/language/core/browser",
"//components/net_log",
"//components/network_hints/common",
"//components/network_hints/browser",
"//components/network_hints/common:mojo_bindings",
"//components/network_hints/renderer",
"//components/network_session_configurator/common",
"//components/prefs",
Expand Down
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gclient_gn_args = [

vars = {
'chromium_version':
'62521aaefdef5b345dd470f14eef6e44732ccf23',
'dc9525d251bf30828899e4cd7161f6dc6507023f',
'node_version':
'v12.13.0',
'nan_version':
Expand Down
1 change: 0 additions & 1 deletion build/args/all.gn
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
is_electron_build = true
use_jumbo_build = true
root_extra_deps = [ "//electron" ]

# Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
Expand Down
1 change: 0 additions & 1 deletion build/args/native_tests.gn
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ is_debug = false
is_component_build = false
is_component_ffmpeg = false
symbol_level = 1
use_jumbo_build = true
49 changes: 45 additions & 4 deletions build/rules.gni
Original file line number Diff line number Diff line change
@@ -1,9 +1,50 @@
import("//build/config/mac/mac_sdk.gni")

# This is imported from /ios becuase this functionality was moved
# after Chromium stopped using xib files for macOS menu functionality
# See https://chromium-review.googlesource.com/c/chromium/src/+/1648695
import("//build/config/ios/rules.gni")
# Template to compile .xib and .storyboard files.
# (copied from src/build/config/ios/rules.gni)
#
# Arguments
#
# sources:
# list of string, sources to compile
#
# ibtool_flags:
# (optional) list of string, additional flags to pass to the ibtool
template("compile_ib_files") {
action_foreach(target_name) {
forward_variables_from(invoker,
[
"testonly",
"visibility",
])
assert(defined(invoker.sources),
"sources must be specified for $target_name")
assert(defined(invoker.output_extension),
"output_extension must be specified for $target_name")

ibtool_flags = []
if (defined(invoker.ibtool_flags)) {
ibtool_flags = invoker.ibtool_flags
}

_output_extension = invoker.output_extension

script = "//build/config/ios/compile_ib_files.py"
sources = invoker.sources
outputs = [
"$target_gen_dir/$target_name/{{source_name_part}}.$_output_extension",
]
args = [
"--input",
"{{source}}",
"--output",
rebase_path(
"$target_gen_dir/$target_name/{{source_name_part}}.$_output_extension",
root_build_dir),
]
args += ibtool_flags
}
}

# Template is copied here from Chromium but was removed in
# https://chromium-review.googlesource.com/c/chromium/src/+/1637981
Expand Down
3 changes: 3 additions & 0 deletions chromium_src/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ static_library("chrome") {
"//chrome/browser/net/proxy_service_factory.h",
"//chrome/browser/predictors/preconnect_manager.cc",
"//chrome/browser/predictors/preconnect_manager.h",
"//chrome/browser/predictors/predictors_features.cc",
"//chrome/browser/predictors/predictors_features.h",
"//chrome/browser/predictors/proxy_lookup_client_impl.cc",
"//chrome/browser/predictors/proxy_lookup_client_impl.h",
"//chrome/browser/predictors/resolve_host_client_impl.cc",
Expand Down Expand Up @@ -319,6 +321,7 @@ source_set("chrome_spellchecker") {
"//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
"//chrome/browser/spellchecker/spellcheck_service.cc",
"//chrome/browser/spellchecker/spellcheck_service.h",
"//chrome/common/pref_names.h",
]

if (has_spellcheck_panel) {
Expand Down
Loading