From ed50200682e0de72c3abecaa4d5324ebcd1ed9f9 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Tue, 27 Jun 2017 14:36:24 +0000 Subject: Revert "sksl fragment processor support" This reverts commit ccf59917d3fe7aaf59de714acfbd0596503f324f. Reason for revert: breaking iOS bots Original change's description: > sksl fragment processor support > > Bug: skia: > Change-Id: Ia3b0305c2b0c78074303831f628fb01852b90d34 > Reviewed-on: https://skia-review.googlesource.com/17843 > Commit-Queue: Ethan Nicholas > Reviewed-by: Ben Wagner > Reviewed-by: Mike Klein TBR=mtklein@google.com,benjaminwagner@google.com,ethannicholas@google.com Change-Id: I0a33060c7c42c7b44c5c13d443ac42958291c2f1 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/20962 Reviewed-by: Ethan Nicholas Commit-Queue: Ethan Nicholas --- gn/BUILDCONFIG.gn | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'gn/BUILDCONFIG.gn') diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index 43f66f8832..2b3ae33292 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -17,21 +17,9 @@ declare_args() { ndk_api = 21 } sanitize = "" - - ar = "ar" - cc = "cc" - cxx = "c++" - - msvc = 2015 } declare_args() { is_debug = !is_official_build - - if (msvc == 2015) { - windk = "C:/Program Files (x86)/Microsoft Visual Studio 14.0" - } else { - windk = "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional" - } } assert(!(is_debug && is_official_build)) @@ -176,12 +164,8 @@ set_defaults("component") { if (is_win) { # Windows tool chain - set_default_toolchain("//gn/toolchain:msvc") - default_toolchain_name = "msvc" - host_toolchain = "msvc" + set_default_toolchain("//gn:msvc") } else { # GCC-like toolchains, including Clang. - set_default_toolchain("//gn/toolchain:gcc_like") - default_toolchain_name = "gcc_like" - host_toolchain = "gcc_like_host" + set_default_toolchain("//gn:gcc_like") } -- cgit v1.2.3