diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 17:33:41 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 17:33:41 +0000 |
| commit | bf0791a666425e2e61400953fa538ed1d2b2edf8 (patch) | |
| tree | 3d6d61f78ccfa044e8cc1aa8c9eb2ff84dd549c1 | |
| parent | 2999e9b7cb19f59c6f2ee38019cd07b7b5c18b6b (diff) | |
| download | chromium_src-bf0791a666425e2e61400953fa538ed1d2b2edf8.zip chromium_src-bf0791a666425e2e61400953fa538ed1d2b2edf8.tar.gz chromium_src-bf0791a666425e2e61400953fa538ed1d2b2edf8.tar.bz2 | |
Don't build testing related plugins on x64 (complicated story with fPIC).
BUG=18337
Review URL: http://codereview.chromium.org/159655
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22283 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 330bb01..bb4c330 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -29,7 +29,6 @@ 'target_name': 'test_shell_common', 'type': '<(library)', 'dependencies': [ - 'npapi_layout_test_plugin', '../../../base/base.gyp:base', '../../../base/base.gyp:base_gfx', '../../../media/media.gyp:media', @@ -105,7 +104,13 @@ '../../webkit.gyp:webkit', ], 'conditions': [ - ['OS!="win"', { + # http://code.google.com/p/chromium/issues/detail?id=18337 + ['target_arch!="x64"', { + 'dependencies': [ + 'npapi_layout_test_plugin', + ], + }], + ['OS!="win" and target_arch!="x64"', { 'dependencies': [ 'npapi_test_plugin', ], @@ -118,6 +123,13 @@ ], # for: test_shell_gtk.cc 'cflags': ['-Wno-multichar'], + }, { # else: OS!=linux + 'sources/': [ + ['exclude', '_gtk\\.cc$'], + ['exclude', '_x11\\.cc$'], + ], + }], + ['OS=="linux" and target_arch!="x64"', { # See below TODO in the Windows branch. 'copies': [ { @@ -125,11 +137,6 @@ 'files': ['<(PRODUCT_DIR)/libnpapi_layout_test_plugin.so'], }, ], - }, { # else: OS!=linux - 'sources/': [ - ['exclude', '_gtk\\.cc$'], - ['exclude', '_x11\\.cc$'], - ], }], ['OS!="mac"', { 'sources/': [ @@ -183,7 +190,6 @@ 'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9', 'dependencies': [ 'test_shell_common', - 'npapi_layout_test_plugin', '../../../tools/imagediff/image_diff.gyp:image_diff', ], 'sources': [ |