Commit d592e61d authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

Simplify chrome_initial in minor ways after #696557.

No intended behavior change.

Bug: none
Change-Id: I2acc32b560f5aea94d9e7b45272194884d65b1e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1804315
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#696654}
parent 0e52cb60
...@@ -137,15 +137,6 @@ if (!is_android && !is_mac) { ...@@ -137,15 +137,6 @@ if (!is_android && !is_mac) {
output_name = "chrome" output_name = "chrome"
} }
sources = []
if (!is_win && use_aura) {
# Non-Windows aura entrypoint.
sources += [ "app/chrome_exe_main_aura.cc" ]
}
deps = []
data = []
if (!is_win || is_clang) { if (!is_win || is_clang) {
# Normally, we need to pass specific flags to the linker to # Normally, we need to pass specific flags to the linker to
# create an executable that gathers profile data. However, when # create an executable that gathers profile data. However, when
...@@ -159,12 +150,18 @@ if (!is_android && !is_mac) { ...@@ -159,12 +150,18 @@ if (!is_android && !is_mac) {
# Because the sources list varies so significantly per-platform, generally # Because the sources list varies so significantly per-platform, generally
# each platform lists its own files rather than relying on filtering or # each platform lists its own files rather than relying on filtering or
# removing unused files. # removing unused files.
sources += [ "app/chrome_exe_resource.h" ] sources = [
"app/chrome_exe_resource.h",
]
defines = [] defines = []
public_deps = [] public_deps = []
deps += [ "//printing/buildflags" ] deps = [
"//printing/buildflags",
]
data += [ "$root_out_dir/resources.pak" ] data = [
"$root_out_dir/resources.pak",
]
if (is_linux || is_win) { if (is_linux || is_win) {
data += [ data += [
"$root_out_dir/chrome_100_percent.pak", "$root_out_dir/chrome_100_percent.pak",
...@@ -245,11 +242,14 @@ if (!is_android && !is_mac) { ...@@ -245,11 +242,14 @@ if (!is_android && !is_mac) {
# Increase the initial stack size. The default is 1MB, this is 1.5MB. # Increase the initial stack size. The default is 1MB, this is 1.5MB.
# To mitigate address space pressure, |CreateThreadInternal| sets the # To mitigate address space pressure, |CreateThreadInternal| sets the
# default back to 1MB for non-main threads. # default back to 1MB for non-main threads.
ldflags = [ "/STACK:1572864" ] ldflags = [ "/STACK:0x180000" ]
} else { } else {
# Increase the initial stack size. The default is 1MB, this is 8MB. # Increase the initial stack size. The default is 1MB, this is 8MB.
ldflags = [ "/STACK:8388608" ] ldflags = [ "/STACK:0x800000" ]
} }
} else if (use_aura) {
# Non-Windows aura entrypoint.
sources += [ "app/chrome_exe_main_aura.cc" ]
} }
if (is_linux) { if (is_linux) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment