Revert of Default SK_ANGLE to true on Windows, run angle whenever possible on bots. (patchset #3 id:40001 of https://codereview.chromium.org/946933006/)
Reason for revert:
Needs bot upgrades.
Original issue's description:
> Default SK_ANGLE to true on Windows, run angle whenever possible on bots.
>
> nanobench doesn't need an update. It uses the default for --config,
> which includes angle.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/88ec329b580a081d9d56cbcaad0ee46cb941c849
TBR=bsalomon@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/954243002
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 3c9aae5..9750187 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -83,10 +83,8 @@
}],
[ 'skia_os == "win"', {
'os_posix%': 0,
- 'skia_angle%': 1,
}, {
'os_posix%': 1,
- 'skia_angle%': 0,
}],
[ 'skia_os in ["linux"]', {
'skia_poppler_enabled%': 1,
@@ -149,6 +147,7 @@
'skia_android_path_rendering%': 0,
'skia_resource_cache_mb_limit%': 0,
'skia_resource_cache_count_limit%': 0,
+ 'skia_angle%': 0,
'skia_gdi%': 0,
'skia_gpu%': 1,
'skia_osx_deployment_target%': '',