commit 762466e9fe0478bcf11fba532998e81e33b3069e
author Ethan Nicholas <ethannicholas@google.com> Thu Jun 29 10:03:38 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 29 14:57:47 2017 +0000
tree 8934a152b11007d7d530db05f7ba731bb05aa5c0
parent e78c8ed9cba31ebb970d3002270ddb03f4d6baae

Re-re-land sksl fragment processor support

This reverts commit 5ce397205528f82084fc650c2ce27d246c01da33.

Bug: skia:
Change-Id: I88260c90004610a1cf8ad1a87c2b4b222525bbb6
Reviewed-on: https://skia-review.googlesource.com/21108
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

gn/BUILDCONFIG.gn

diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn
index 2b3ae33..43f66f8 100644
--- a/gn/BUILDCONFIG.gn
+++ b/gn/BUILDCONFIG.gn
@@ -17,9 +17,21 @@
     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))
@@ -164,8 +176,12 @@
 
 if (is_win) {
   # Windows tool chain
-  set_default_toolchain("//gn:msvc")
+  set_default_toolchain("//gn/toolchain:msvc")
+  default_toolchain_name = "msvc"
+  host_toolchain = "msvc"
 } else {
   # GCC-like toolchains, including Clang.
-  set_default_toolchain("//gn:gcc_like")
+  set_default_toolchain("//gn/toolchain:gcc_like")
+  default_toolchain_name = "gcc_like"
+  host_toolchain = "gcc_like_host"
 }