win/swarming: Make 64-bit debug component builds work on swarming?

base/base.isolate

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'includes': [
     # While the target 'base' doesn't depend on ../third_party/icu/icu.gyp
     # itself, virtually all targets using it has to include icu. The only
     # exception is the Windows sandbox (?).
     '../third_party/icu/icu.isolate',
   ],
@@ skipping 35 matching lines @@
         ],
       },
     }],
     ['lsan==1', {
       'variables': {
         'files': [
           '../tools/lsan/suppressions.txt',
         ],
       },
     }],
+    # Copy the VS runtime DLLs into the isolate so that they
+    # don't have to be preinstalled on the target machine.
+    ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"', {

[scottmg, 2015/02/03 20:40:18]

You might need a /x64/msvcr120.dll for shared_library, Release if such a bot
exists too?

[Nico, 2015/02/03 20:45:22]

Uhhh…added it, but nothing's red because of that. Maybe only some tests need
this in release or something? But since CopyVsRuntimeDlls() installs them, maybe
adding this will save someone else a few hours.

+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/x64/msvcp120d.dll',

[M-A Ruel, 2015/02/03 20:40:01]

cute

So both 32 and 64 bits versions need to be mapped?

+          '<(PRODUCT_DIR)/x64/msvcr120d.dll',
+        ],
+      },
+    }],
     ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', {
       'variables': {
         'files': [
-          # Copy the VS runtime DLLs into the isolate so that they
-          # don't have to be preinstalled on the target machine.
           '<(PRODUCT_DIR)/msvcp120d.dll',
           '<(PRODUCT_DIR)/msvcr120d.dll',
-          '<(PRODUCT_DIR)/x64/msvcp120d.dll',
-          '<(PRODUCT_DIR)/x64/msvcr120d.dll',
         ],
       },
     }],
     ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', {
       'variables': {
         'files': [
-          # Copy the VS runtime DLLs into the isolate so that they
-          # don't have to be preinstalled on the target machine.
           '<(PRODUCT_DIR)/msvcp120.dll',
           '<(PRODUCT_DIR)/msvcr120.dll',
         ],
       },
     }],
   ],
 }