Make the Windows sandbox support a normal x64 build

sandbox/win/sandbox_win.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.
 
 {
   'target_defaults': {
     'variables': {
       'sandbox_windows_target': 0,
+      'target_arch%': 'ia32',
     },
     'target_conditions': [
       ['sandbox_windows_target==1', {
         # Files that are shared between the 32-bit and the 64-bit versions
         # of the Windows sandbox library.
         'sources': [
             'src/acl.cc',
             'src/acl.h',
             'src/app_container.cc',
             'src/app_container.h',
@@ skipping 108 matching lines @@
             'src/target_services.cc',
             'src/target_services.h',
             'src/win_utils.cc',
             'src/win_utils.h',
             'src/win2k_threadpool.cc',
             'src/win2k_threadpool.h',
             'src/window.cc',
             'src/window.h',
         ],
       }],
+      ['target_arch=="x64"', {
+        'sources': [
+          'src/interceptors_64.cc',

[rvargas (doing something else), 2013/01/04 22:39:42]

Very nice!.

Something we could consider for the future is automagically excluding *_64.cc
from 32-bit builds and the other way around (like we exclude *_win.cc from mac
etc). We probably have all wee need for that already.

+          'src/interceptors_64.h',
+          'src/resolver_64.cc',
+          'src/service_resolver_64.cc',
+          'src/Wow64_64.cc',
+        ],
+      }],
+      ['target_arch=="ia32"', {
+        'sources': [
+          'src/resolver_32.cc',
+          'src/service_resolver_32.cc',
+          'src/sidestep_resolver.cc',
+          'src/sidestep_resolver.h',
+          'src/sidestep\ia32_modrm_map.cpp',
+          'src/sidestep\ia32_opcode_map.cpp',
+          'src/sidestep\mini_disassembler_types.h',
+          'src/sidestep\mini_disassembler.cpp',
+          'src/sidestep\mini_disassembler.h',
+          'src/sidestep\preamble_patcher_with_stub.cpp',
+          'src/sidestep\preamble_patcher.h',
+          'src/Wow64.cc',
+          'src/Wow64.h',
+        ],
+      }],
     ],
   },
   'targets': [
     {
       'target_name': 'sandbox',
       'type': 'static_library',
       'variables': {
         'sandbox_windows_target': 1,
       },
       'dependencies': [
         '../testing/gtest.gyp:gtest',
         '../base/base.gyp:base',
         '../base/base.gyp:base_static',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
       ],
-      'sources': [
-        # Files that are used by the 32-bit version of Windows sandbox only.
-        'src/resolver_32.cc',
-        'src/service_resolver_32.cc',
-        'src/sidestep_resolver.cc',
-        'src/sidestep_resolver.h',
-        'src/sidestep\ia32_modrm_map.cpp',
-        'src/sidestep\ia32_opcode_map.cpp',
-        'src/sidestep\mini_disassembler_types.h',
-        'src/sidestep\mini_disassembler.cpp',
-        'src/sidestep\mini_disassembler.h',
-        'src/sidestep\preamble_patcher_with_stub.cpp',
-        'src/sidestep\preamble_patcher.h',
-        'src/Wow64.cc',
-        'src/Wow64.h',
-      ],
       'include_dirs': [
         '../..',
       ],
       'copies': [
         {
           'destination': '<(PRODUCT_DIR)',
           'files': [
             'wow_helper/wow_helper.exe',
             'wow_helper/wow_helper.pdb',
           ],
         },
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'src',
           '../..',
         ],
       },
     },
     {
       'target_name': 'sandbox_win64',
       'type': 'static_library',
       'variables': {
         'sandbox_windows_target': 1,
+        'target_arch': 'x64',
       },
       'dependencies': [
         '../testing/gtest.gyp:gtest',
         '../base/base.gyp:base_nacl_win64',
         '../base/base.gyp:base_static_win64',
       ],
       'configurations': {
         'Common_Base': {
           'msvs_target_platform': 'x64',
         },
       },
-      'sources': [
-        # Files that are used by the 64-bit version of Windows sandbox only.
-        'src/interceptors_64.cc',
-        'src/interceptors_64.h',
-        'src/resolver_64.cc',
-        'src/service_resolver_64.cc',
-        'src/Wow64_64.cc',
-      ],
       'include_dirs': [
         '../..',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'src',
           '../..',
         ],
       },
       'defines': [
@@ skipping 115 matching lines @@
       ],
       'defines': [
         'POCDLL_EXPORTS',
       ],
       'include_dirs': [
         '../..',
       ],
     },
   ],
 }