diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-16 21:55:07 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-16 21:55:07 +0000 |
| commit | 61750a6768d0fc38f8b21ccf48478b9cfeb0fed8 (patch) | |
| tree | 34b8c5c31e0b125ba974d2661cf257999cb0dba3 /chrome/chrome_tests.gypi | |
| parent | c47ee3fe8eb962680d1597bc1e63c666833f1a57 (diff) | |
| download | chromium_src-61750a6768d0fc38f8b21ccf48478b9cfeb0fed8.zip chromium_src-61750a6768d0fc38f8b21ccf48478b9cfeb0fed8.tar.gz chromium_src-61750a6768d0fc38f8b21ccf48478b9cfeb0fed8.tar.bz2 | |
Don't build npapi_test_plugin on x64
BUG=18337
Review URL: http://codereview.chromium.org/507027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rwxr-xr-x | chrome/chrome_tests.gypi | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index cf983d0..8750f1c 100755 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -265,7 +265,6 @@ '../third_party/libxml/libxml.gyp:libxml', # run time dependencies '../webkit/tools/test_shell/test_shell.gyp:npapi_layout_test_plugin', - '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', ], 'include_dirs': [ '..', @@ -317,6 +316,12 @@ 'worker/worker_uitest.cc', ], 'conditions': [ + # http://code.google.com/p/chromium/issues/detail?id=18337 + ['target_arch!="x64" and target_arch!="arm"', { + 'dependencies': [ + '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', + ], + }], ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', |