diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 10:03:21 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 10:03:21 +0000 |
| commit | f1417152d41e2e9b91f192d39a6fa9e55455e904 (patch) | |
| tree | 7962bd7299220cddc9e44241fa769ec4fc16db84 /remoting/remoting.gyp | |
| parent | 3b6d584a0aec92d6db1f7a0cc4655f69fef95a93 (diff) | |
| download | chromium_src-f1417152d41e2e9b91f192d39a6fa9e55455e904.zip chromium_src-f1417152d41e2e9b91f192d39a6fa9e55455e904.tar.gz chromium_src-f1417152d41e2e9b91f192d39a6fa9e55455e904.tar.bz2 | |
Revert 74571 - Use SSE2 block differ for chromoting
(Quick test to see if it is the cause of crashes in media_unittests)
We have the SSE2 lying around in the tree just never being used. This will
allow us to use it.
BUG=None
TEST=Chromoting to a host machine and the diff will work correctly
Review URL: http://codereview.chromium.org/6469022
TBR=hclam@chromium.org
Review URL: http://codereview.chromium.org/6488023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 9b5239f..f39ef6b 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -183,7 +183,6 @@ 'chromoting_base', 'chromoting_jingle_glue', 'chromoting_protocol', - 'differ_block', ], 'sources': [ 'host/access_verifier.cc', @@ -198,6 +197,8 @@ 'host/chromoting_host_context.h', 'host/differ.h', 'host/differ.cc', + 'host/differ_block.h', + 'host/differ_block.cc', 'host/screen_recorder.cc', 'host/screen_recorder.h', 'host/heartbeat_sender.cc', @@ -420,46 +421,6 @@ }, # end of target 'chromoting_protocol' { - 'target_name': 'differ_block', - 'type': '<(library)', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../media/media.gyp:cpu_features', - ], - 'conditions': [ - [ 'target_arch == "ia32" or target_arch == "x64"', { - 'dependencies': [ - 'differ_block_sse2', - ], - }], - ], - 'sources': [ - 'host/differ_block.cc', - 'host/differ_block.h', - ], - }, # end of target differ_block - - { - 'target_name': 'differ_block_sse2', - 'type': '<(library)', - 'include_dirs': [ - '..', - ], - 'conditions': [ - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { - 'cflags': [ - '-msse2', - ], - }], - ], - 'sources': [ - 'host/differ_block_sse2.cc', - ], - }, # end of target differ_block_sse2 - - { 'target_name': 'chromotocol_test_client', 'type': 'executable', 'dependencies': [ |