diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 22:24:43 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 22:24:43 +0000 |
| commit | fe474ed7f9eee2c666a3be32336c359c67d40fc4 (patch) | |
| tree | 8f0ac8dd1eb460d7d48397a5708f34f8ed8e46d7 /chrome | |
| parent | 89eca17fd5af241a12532ba6f714cb37424c55a4 (diff) | |
| download | chromium_src-fe474ed7f9eee2c666a3be32336c359c67d40fc4.zip chromium_src-fe474ed7f9eee2c666a3be32336c359c67d40fc4.tar.gz chromium_src-fe474ed7f9eee2c666a3be32336c359c67d40fc4.tar.bz2 | |
Updates to be able to build all targets in Linux x64.
Review URL: http://codereview.chromium.org/174261
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index c4f600e..896d277 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -4970,7 +4970,6 @@ '../testing/gtest.gyp:gtest', '../third_party/npapi/npapi.gyp:npapi', # run time dependency - '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', '../webkit/webkit.gyp:webkit_resources', ], 'include_dirs': [ @@ -5002,6 +5001,12 @@ 'test/interactive_ui/view_event_test_base.h', ], }], + ['target_arch!="x64"', { + 'dependencies': [ + # run time dependency + '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', + ], + }], ['OS=="linux" and toolkit_views==1', { 'dependencies': [ '../views/views.gyp:views', |