diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-04 22:47:37 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-04 22:47:37 +0000 |
| commit | 4bc818e1dc285910638203a0d94063a9e92e36b0 (patch) | |
| tree | 871de4bc758b249b02246e0a449cd3c7960f76e3 /base | |
| parent | bd06fc48da4098267e99ae9e03313c3689100147 (diff) | |
| download | chromium_src-4bc818e1dc285910638203a0d94063a9e92e36b0.zip chromium_src-4bc818e1dc285910638203a0d94063a9e92e36b0.tar.gz chromium_src-4bc818e1dc285910638203a0d94063a9e92e36b0.tar.bz2 | |
Sandbox: Finish the interception manager support for x64.
Unit tests and integration tests run (as long as they don't
depend on IPCs), both regular and under SANDBOX_EXPORTS.
The interception agent is there, but no EAT interceptions yet.
BUG=27218
TEST=unit tests/ integration tests.
Review URL: http://codereview.chromium.org/565026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gypi | 4 | ||||
| -rw-r--r-- | base/pe_image.cc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/base/base.gypi b/base/base.gypi index f463b73..c7e3a29 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -129,6 +129,8 @@ 'observer_list_threadsafe.h', 'path_service.cc', 'path_service.h', + 'pe_image.cc', + 'pe_image.h', 'pickle.cc', 'pickle.h', 'platform_file.h', @@ -546,8 +548,6 @@ 'nsimage_cache_mac.mm', 'nss_util.cc', 'nss_util.h', - 'pe_image.cc', - 'pe_image.h', 'setproctitle_linux.c', 'setproctitle_linux.h', 'sha2.cc', diff --git a/base/pe_image.cc b/base/pe_image.cc index 33fa20c..f2fb140 100644 --- a/base/pe_image.cc +++ b/base/pe_image.cc @@ -7,7 +7,8 @@ #include "base/pe_image.h" -#ifdef _WIN64 +#if defined(_WIN64) && !defined(NACL_WIN64) +// TODO(rvargas): Bug 27218. Make sure this is ok. #error This code is not tested on x64. Please make sure all the base unit tests\ pass before doing any real work. The current unit tests don't test the\ differences between 32- and 64-bits implementations. Bugs may slip through.\ |