Fix GN generation for WinASAN build

build/config/sanitizers/BUILD.gn

Index: build/config/sanitizers/BUILD.gn
diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn
index 2c490165f2b237a282aa3772a1ae7c2d63d190f6..1aae5cc10d42b8ed5fc9450f8710456608e33b48 100644
--- a/build/config/sanitizers/BUILD.gn
+++ b/build/config/sanitizers/BUILD.gn
@@ -241,16 +241,30 @@ config("asan_flags") {
     }
 
     if (is_win) {
-      assert(current_cpu == "x86", "WinASan is 32-bit only currently")
-      if (is_component_build) {
-        libs = [
-          "clang_rt.asan_dynamic-i386.lib",
-          "clang_rt.asan_dynamic_runtime_thunk-i386.lib",
-        ]
+      if (target_cpu == "x64") {
+        # Windows 64-bit.
+        if (is_component_build) {
+          libs = [
+            "clang_rt.asan_dynamic-x86_64.lib",
+            "clang_rt.asan_dynamic_runtime_thunk-x86_64.lib",
+          ]
+        } else {
+          # TODO(etienneb): DLLs in the non-component build should link against
+          # clang_rt.asan_dll_thunk-x86_64.lib instead.
+          libs = [ "clang_rt.asan-x86_64.lib" ]
+        }
       } else {
-        # TODO(rnk): DLLs in the non-component build should link against
-        # clang_rt.asan_dll_thunk-i386.lib instead.
-        libs = [ "clang_rt.asan-i386.lib" ]
+        assert(target_cpu == "x86", "WinASan unsupported architecture")
+        if (is_component_build) {
+          libs = [
+            "clang_rt.asan_dynamic-i386.lib",
+            "clang_rt.asan_dynamic_runtime_thunk-i386.lib",
+          ]
+        } else {
+          # TODO(etienneb): DLLs in the non-component build should link against
+          # clang_rt.asan_dll_thunk-i386.lib instead.
+          libs = [ "clang_rt.asan-i386.lib" ]

[Dirk Pranke, 2016/07/30 00:57:38]

why not just change this to clang_rt.asan_dll_thunk-i386.lib, if this is true?

+        }
       }
     }
   }