From f1417152d41e2e9b91f192d39a6fa9e55455e904 Mon Sep 17 00:00:00 2001
From: "finnur@chromium.org"
 <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 11 Feb 2011 10:03:21 +0000
Subject: 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
---
 remoting/remoting.gyp | 43 ++-----------------------------------------
 1 file changed, 2 insertions(+), 41 deletions(-)

(limited to 'remoting/remoting.gyp')

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': [
-- 
cgit v1.1