diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 18:15:25 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 18:15:25 +0000 |
| commit | a9710f39948f20b8eb3d9897a692a594374ee576 (patch) | |
| tree | e365868bbafe2cac6fd3219c6d7520e5a0338e33 | |
| parent | 2111b1acfc64a286e1761d9e9b6c3c55d95ca952 (diff) | |
| download | chromium_src-a9710f39948f20b8eb3d9897a692a594374ee576.zip chromium_src-a9710f39948f20b8eb3d9897a692a594374ee576.tar.gz chromium_src-a9710f39948f20b8eb3d9897a692a594374ee576.tar.bz2 | |
Don't link NaCl code into chrome.exe on Mac (fix bug 37707)
BUG=37707
TEST=build Chrome on Mac
Review URL: http://codereview.chromium.org/853007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41449 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/chrome_exe.gypi | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -6,7 +6,7 @@ vars = { "skia_revision": "504", "chromium_git": "http://src.chromium.org/git", "swig_revision": "40423", - "nacl_revision": "1702", + "nacl_revision": "1704", } deps = { diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index b42a673..cd247ce 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -333,8 +333,6 @@ 'dependencies': [ 'helper_app', 'infoplist_strings_tool', - # This library provides the real implementation for NaClSyscallSeg - '../native_client/src/trusted/service_runtime/arch/x86_32/service_runtime_x86_32.gyp:service_runtime_x86_32_chrome' ], 'actions': [ { |