Fix Clang dEQP build on Win.

DEPS

@@ -6,13 +6,13 @@ vars = {
 deps = {
 
   'build':
-    Var('chromium_git') + '/chromium/src/build.git' + '@' + 'bd767a7bd2689943bca4b66009aad279b55487f8',
+    Var('chromium_git') + '/chromium/src/build.git' + '@' + '8a1537f019e55807420ae76c62e4ce8f56fedca1',
 
   'buildtools':
-    Var('chromium_git') + '/chromium/buildtools.git' + '@' + '93a751e41bd93e373548759c6c5453bd95b6f35e',
+    Var('chromium_git') + '/chromium/buildtools.git' + '@' + '461b345a815c1c745ac0534a6a4bd52d123abe68',
 
   'testing':
-    Var('chromium_git') + '/chromium/src/testing' + '@' + '8893f3930ce94c9e5350e0e87ddf159bf1d495b8',
+    Var('chromium_git') + '/chromium/src/testing' + '@' + '6dfa36ab2e5143fa2f7353e3af5d2935af2e61f7',
 
   # Cherry is a dEQP management GUI written in Go. We use it for viewing test results.
   'third_party/cherry':
@@ -54,6 +54,7 @@ hooks = [
   {
     'name': 'clang_format_win',
     'pattern': '.',
+    'condition': 'host_os == "win"',
     'action': [ 'download_from_google_storage',
                 '--no_resume',
                 '--platform=win32',
@@ -65,6 +66,7 @@ hooks = [
   {
     'name': 'clang_format_mac',
     'pattern': '.',
+    'condition': 'host_os == "mac"',
     'action': [ 'download_from_google_storage',
                 '--no_resume',
                 '--platform=darwin',
@@ -76,6 +78,7 @@ hooks = [
   {
     'name': 'clang_format_linux',
     'pattern': '.',
+    'condition': 'host_os == "linux"',
     'action': [ 'download_from_google_storage',
                 '--no_resume',
                 '--platform=linux*',
@@ -88,6 +91,7 @@ hooks = [
   {
     'name': 'gn_win',
     'pattern': '.',
+    'condition': 'host_os == "win"',
     'action': [ 'download_from_google_storage',
                 '--no_resume',
                 '--platform=win32',
@@ -99,6 +103,7 @@ hooks = [
   {
     'name': 'gn_mac',
     'pattern': '.',
+    'condition': 'host_os == "mac"',
     'action': [ 'download_from_google_storage',
                 '--no_resume',
                 '--platform=darwin',
@@ -110,6 +115,7 @@ hooks = [
   {
     'name': 'gn_linux64',
     'pattern': '.',
+    'condition': 'host_os == "linux"',
     'action': [ 'download_from_google_storage',
                 '--no_resume',
                 '--platform=linux*',
@@ -119,7 +125,6 @@ hooks = [
     ],
   },
   {
-    # Pull clang if needed or requested via GYP_DEFINES.
     # Note: On Win, this should run after win_toolchain, as it may use it.
     'name': 'clang',
     'pattern': '.',

src/tests/BUILD.gn

@@ -4,7 +4,6 @@
 
 import("../../gni/angle.gni")
 import("//build/config/chromecast_build.gni")
-import("//build/config/angle_temp.gni")
 import("//testing/test.gni")
 
 unittests_gypi = exec_script("//build/gypi_to_gn.py",
@@ -314,6 +313,7 @@ if (build_angle_deqp_tests) {
 
   deqp_undefine_configs = [
     "//build/config/compiler:chromium_code",
+    "//build/config/compiler:no_exceptions",
     "//build/config/compiler:no_rtti",
   ]
 
@@ -325,28 +325,15 @@ if (build_angle_deqp_tests) {
     ]
   }
 
-  # TODO(jmadill): Fix this once upstream change is landed.
-  if (is_temp_angle) {
-    deqp_undefine_configs += [ "//build/config/compiler:no_exceptions" ]
-  } else {
-    if (is_linux || is_android || is_mac) {
-      deqp_undefine_configs += [ "//build/config/gcc:no_exceptions" ]
-    }
-  }
-
   static_library("angle_deqp_decpp") {
     configs -= deqp_undefine_configs
     public_configs = [
       ":angle_deqp_support",
+      "//build/config/compiler:exceptions",
       "//build/config/compiler:no_chromium_code",
       angle_root + ":internal_config",
     ]
 
-    # TODO(jmadill): Fix this once upstream change is landed.
-    if (is_temp_angle) {
-      public_configs += [ "//build/config/compiler:exceptions" ]
-    }
-
     sources = rebase_path(deqp_gypi.deqp_libtester_decpp_sources, ".", "../..")
   }