From 58cf683f4d671bcaa0799e996f39808b0495b38c Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Tue, 8 Jan 2013 18:30:10 +0100
Subject: [PATCH] Bug 827359 - Disable unconditional use of NEON code in WebRTC
 DSP code. r=jesup

---
 .../common_audio/signal_processing/signal_processing.gypi    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media/webrtc/trunk/src/common_audio/signal_processing/signal_processing.gypi b/media/webrtc/trunk/src/common_audio/signal_processing/signal_processing.gypi
index 57310f90cffc..de50904f84a8 100644
--- a/media/webrtc/trunk/src/common_audio/signal_processing/signal_processing.gypi
+++ b/media/webrtc/trunk/src/common_audio/signal_processing/signal_processing.gypi
@@ -75,7 +75,7 @@
                 'filter_ar_fast_q12.c',
               ],
               'conditions': [
-                ['arm_neon==1', {
+                ['0==1 and arm_neon==1', {
                   'sources': [
                     'cross_correlation_neon.s',
                     'downsample_fast_neon.s',
@@ -88,6 +88,9 @@
                   ],
                 }],
               ],
+              'defines!': [
+                'WEBRTC_ARCH_ARM_NEON'
+              ],
             }],
           ],
         }],