diff options
| -rw-r--r-- | sandbox/win/sandbox_win.gypi | 54 | ||||
| -rw-r--r-- | sandbox/win/src/sandbox.cc | 4 |
2 files changed, 32 insertions, 26 deletions
diff --git a/sandbox/win/sandbox_win.gypi b/sandbox/win/sandbox_win.gypi index 0b3f590..a280442 100644 --- a/sandbox/win/sandbox_win.gypi +++ b/sandbox/win/sandbox_win.gypi @@ -6,6 +6,7 @@ 'target_defaults': { 'variables': { 'sandbox_windows_target': 0, + 'target_arch%': 'ia32', }, 'target_conditions': [ ['sandbox_windows_target==1', { @@ -133,6 +134,34 @@ 'src/window.cc', 'src/window.h', ], + 'target_conditions': [ + ['target_arch=="x64"', { + 'sources': [ + 'src/interceptors_64.cc', + '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', + ], + }], + ], }], ], }, @@ -151,22 +180,6 @@ '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': [ '../..', ], @@ -191,6 +204,7 @@ 'type': 'static_library', 'variables': { 'sandbox_windows_target': 1, + 'target_arch': 'x64', }, 'dependencies': [ '../testing/gtest.gyp:gtest', @@ -202,14 +216,6 @@ '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': [ '../..', ], diff --git a/sandbox/win/src/sandbox.cc b/sandbox/win/src/sandbox.cc index 3344ba4..eaa8963 100644 --- a/sandbox/win/src/sandbox.cc +++ b/sandbox/win/src/sandbox.cc @@ -11,8 +11,8 @@ #if defined(_WIN64) && !defined(NACL_WIN64) // We allow building this code for Win64 as part of NaCl to enable development -#error Sandbox code was not tested on 64-bit Windows. See \ - http://crbug.com/27218 for details and progress log. +#pragma message("Sandbox code was not fully tested on 64-bit Windows.\ + crbug.com/168414 ") #endif |