Commit 6bb47923 authored by brettw's avatar brettw Committed by Commit bot

Disable chrome target and tests on Windows.

The bots don't have the capacity to link these targets.

TBR=dpranke

Review URL: https://codereview.chromium.org/891893002

Cr-Commit-Position: refs/heads/master@{#314065}
parent f16b59a0
...@@ -76,6 +76,11 @@ declare_args() { ...@@ -76,6 +76,11 @@ declare_args() {
# cross-compiles (compiling the same target for multiple toolchains in the # cross-compiles (compiling the same target for multiple toolchains in the
# same build) to work. # same build) to work.
target_arch = "arm" target_arch = "arm"
# TODO(brettw) remove this flag (and therefore enable linking all targets) on
# Windows when we have sufficient bot capacity. In the meantime, you can
# enable linking for local compiles.
link_chrome_on_windows = false
} }
# ============================================================================= # =============================================================================
......
...@@ -12,7 +12,14 @@ if (is_android) { ...@@ -12,7 +12,14 @@ if (is_android) {
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
} }
if (!is_android) { if (is_win && !link_chrome_on_windows) {
# When linking is disabled on Windows, create a dummy Chrome target to
# make targets work that depend on Chrome.
group("chrome") {
}
}
if (!is_android && (!is_win || link_chrome_on_windows)) {
# TODO(GYP) for Windows need to the the reorder-imports step which probably # TODO(GYP) for Windows need to the the reorder-imports step which probably
# means adding another target and renaming this to chrome_initial like in GYP. # means adding another target and renaming this to chrome_initial like in GYP.
executable("chrome") { executable("chrome") {
......
...@@ -212,7 +212,7 @@ source_set("test_support_unit") { ...@@ -212,7 +212,7 @@ source_set("test_support_unit") {
] ]
} }
if (!is_android) { if (!is_android && (!is_win || link_chrome_on_windows)) {
gypi_values = exec_script("//build/gypi_to_gn.py", gypi_values = exec_script("//build/gypi_to_gn.py",
[ rebase_path("../chrome_tests.gypi") ], [ rebase_path("../chrome_tests.gypi") ],
"scope", "scope",
......
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