Commit 300365f1 authored by Nico Weber's avatar Nico Weber

Omit next_version_mini_installer target from win/cross builds for now.

I need some more time to figure out what to do here, but there's a bot
now and it also needs to be able to build.  So remove the target from
the build in cross builds for now.

TBR=grt

Bug: 799827
Change-Id: I3a07ae1298025651e873342b3e1220e546d3e24c
Reviewed-on: https://chromium-review.googlesource.com/935262Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#538887}
parent b94d476a
...@@ -588,7 +588,9 @@ group("gn_all") { ...@@ -588,7 +588,9 @@ group("gn_all") {
"//tools/win/chromeexts:chromeexts", "//tools/win/chromeexts:chromeexts",
] ]
if (!(is_component_build && is_debug && target_cpu == "x86")) { # TODO(thakis): Enable this in cross builds, https://crbug.com/799827
if (!(is_component_build && is_debug && target_cpu == "x86") &&
host_os == "win") {
deps += deps +=
[ "//chrome/installer/mini_installer:next_version_mini_installer" ] [ "//chrome/installer/mini_installer:next_version_mini_installer" ]
} }
......
...@@ -302,7 +302,9 @@ if (is_syzyasan) { ...@@ -302,7 +302,9 @@ if (is_syzyasan) {
# next_version_mini_installer.exe can't be generated in an x86 Debug component # next_version_mini_installer.exe can't be generated in an x86 Debug component
# build because it requires too much memory. # build because it requires too much memory.
if (!(is_component_build && is_debug && target_cpu == "x86")) { # TODO(thakis): Enable this in cross builds, https://crbug.com/799827
if (!(is_component_build && is_debug && target_cpu == "x86") &&
host_os == "win") {
action("next_version_mini_installer") { action("next_version_mini_installer") {
script = "generate_next_version_mini_installer.py" script = "generate_next_version_mini_installer.py"
testonly = true testonly = true
......
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