Fix Win64 DirectX redistributables

content/content_gpu.gypi

 # Copyright (c) 2012 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../skia/skia.gyp:skia',
     '../ui/gl/gl.gyp:gl',
   ],
@@ skipping 22 matching lines @@
       ],
       'link_settings': {
         'libraries': [
           '-lsetupapi.lib',
         ],
       },
       'copies': [
         {
           'destination': '<(PRODUCT_DIR)',
           'files': [
-            '<(windows_sdk_path)/Redist/D3D/x86/d3dcompiler_46.dll',
+            '<(windows_sdk_path)/Redist/D3D/<(winsdk_arch)/d3dcompiler_46.dll',
           ],
         },
       ],
     }],
-    ['OS=="win" and directxsdk_exists=="True"', {
+    ['OS=="win" and target_arch=="ia32" and directxsdk_exists=="True"', {
       'actions': [
         {
           'action_name': 'extract_d3dcompiler',
           'variables': {
             'input': 'Jun2010_D3DCompiler_43_x86.cab',

[scottmg, 2013/08/05 23:39:03]

we don't need to extract the x64 one? it's part of the os on 7/8 i assume? add a
comment to that effect if that's why.

[apatrick_chromium, 2013/08/06 00:06:47]

43 is the more recent version that works on XP. We never use it on Vista and
later. So it doesn't need to be extracted if 64-bit is not supported on XP.
Agree on adding a comment.

[jschuh, 2013/08/06 00:26:56]

Done.

             'output': 'D3DCompiler_43.dll',
           },
           'inputs': [
             '../third_party/directxsdk/files/Redist/<(input)',
           ],
           'outputs': [
             '<(PRODUCT_DIR)/<(output)',
           ],
           'action': [
             'python',
@@ skipping 11 matching lines @@
         '<(DEPTH)/third_party/openmax/il',
       ],
     }],
     ['target_arch!="arm" and chromeos == 1', {
       'include_dirs': [
         '<(DEPTH)/third_party/libva',
       ],
     }],
   ],
 }