From 1407adb2a1d6a92d595ae616b7b70e5367e84bfd Mon Sep 17 00:00:00 2001
From: Nicolas Noble <nnoble@google.com>
Date: Wed, 11 Feb 2015 17:20:59 -0800
Subject: [PATCH 1/2] Ran build-cleaner, and re-generated project files.

---
 build.json                                   | 8 ++++----
 vsprojects/vs2013/gpr_shared.vcxproj         | 2 ++
 vsprojects/vs2013/gpr_shared.vcxproj.filters | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build.json b/build.json
index ca41c8dcb39..401ef051924 100644
--- a/build.json
+++ b/build.json
@@ -1628,7 +1628,6 @@
     {
       "name": "qps_client",
       "build": "test",
-      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/qps/qpstest.proto",
@@ -1641,12 +1640,12 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ]
+      ],
+      "run": false
     },
     {
       "name": "qps_server",
       "build": "test",
-      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/qps/qpstest.proto",
@@ -1659,7 +1658,8 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ]
+      ],
+      "run": false
     },
     {
       "name": "ruby_plugin",
diff --git a/vsprojects/vs2013/gpr_shared.vcxproj b/vsprojects/vs2013/gpr_shared.vcxproj
index 0b3d4eab7c6..b9131e381c1 100644
--- a/vsprojects/vs2013/gpr_shared.vcxproj
+++ b/vsprojects/vs2013/gpr_shared.vcxproj
@@ -120,6 +120,8 @@
     </ClCompile>
     <ClCompile Include="..\..\src\core\support\cpu_posix.c">
     </ClCompile>
+    <ClCompile Include="..\..\src\core\support\cpu_windows.c">
+    </ClCompile>
     <ClCompile Include="..\..\src\core\support\env_linux.c">
     </ClCompile>
     <ClCompile Include="..\..\src\core\support\env_posix.c">
diff --git a/vsprojects/vs2013/gpr_shared.vcxproj.filters b/vsprojects/vs2013/gpr_shared.vcxproj.filters
index 20e4e07c49d..1e908a5ba51 100644
--- a/vsprojects/vs2013/gpr_shared.vcxproj.filters
+++ b/vsprojects/vs2013/gpr_shared.vcxproj.filters
@@ -16,6 +16,9 @@
     <ClCompile Include="..\..\src\core\support\cpu_posix.c">
       <Filter>src\core\support</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\core\support\cpu_windows.c">
+      <Filter>src\core\support</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\core\support\env_linux.c">
       <Filter>src\core\support</Filter>
     </ClCompile>

From 9d085a32d826ff16a8f4a398600830df1d8ad9e5 Mon Sep 17 00:00:00 2001
From: Craig Tiller <craig.tiller@gmail.com>
Date: Wed, 11 Feb 2015 18:17:01 -0800
Subject: [PATCH 2/2] Generate more pleasing build.json output

run: was getting a little lost
---
 build.json                      | 44 ++++++++++++++++-----------------
 tools/buildgen/build-cleaner.py |  1 +
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/build.json b/build.json
index 401ef051924..d3e496e3799 100644
--- a/build.json
+++ b/build.json
@@ -760,6 +760,7 @@
     {
       "name": "echo_client",
       "build": "test",
+      "run": false,
       "language": "c",
       "src": [
         "test/core/echo/client.c"
@@ -769,12 +770,12 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "echo_server",
       "build": "test",
+      "run": false,
       "language": "c",
       "src": [
         "test/core/echo/server.c"
@@ -784,8 +785,7 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "echo_test",
@@ -818,6 +818,7 @@
     {
       "name": "fling_client",
       "build": "test",
+      "run": false,
       "language": "c",
       "src": [
         "test/core/fling/client.c"
@@ -827,12 +828,12 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "fling_server",
       "build": "test",
+      "run": false,
       "language": "c",
       "src": [
         "test/core/fling/server.c"
@@ -842,8 +843,7 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "fling_stream_test",
@@ -1253,6 +1253,7 @@
     {
       "name": "json_rewrite",
       "build": "test",
+      "run": false,
       "language": "c",
       "src": [
         "test/core/json/json_rewrite.c"
@@ -1260,12 +1261,12 @@
       "deps": [
         "grpc",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "json_rewrite_test",
       "build": "test",
+      "run": false,
       "language": "c",
       "src": [
         "test/core/json/json_rewrite_test.c"
@@ -1275,8 +1276,7 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "json_test",
@@ -1588,6 +1588,7 @@
     {
       "name": "interop_client",
       "build": "test",
+      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/interop/empty.proto",
@@ -1602,12 +1603,12 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "interop_server",
       "build": "test",
+      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/interop/empty.proto",
@@ -1622,12 +1623,12 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "qps_client",
       "build": "test",
+      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/qps/qpstest.proto",
@@ -1640,12 +1641,12 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "qps_server",
       "build": "test",
+      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/qps/qpstest.proto",
@@ -1658,8 +1659,7 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "ruby_plugin",
@@ -1727,6 +1727,7 @@
     {
       "name": "tips_client",
       "build": "test",
+      "run": false,
       "language": "c++",
       "src": [
         "examples/tips/main.cc"
@@ -1739,8 +1740,7 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "tips_publisher_test",
diff --git a/tools/buildgen/build-cleaner.py b/tools/buildgen/build-cleaner.py
index 4992beb8970..6477ad202fa 100755
--- a/tools/buildgen/build-cleaner.py
+++ b/tools/buildgen/build-cleaner.py
@@ -13,6 +13,7 @@ _VERSION_KEYS = ['major', 'minor', 'micro', 'build']
 _ELEM_KEYS = [
     'name', 
     'build', 
+    'run',
     'language', 
     'public_headers', 
     'headers',