Bug 819246 - arm_neon is meaningful only when armv7 is true. r=jesup

dothq · Dec 10, 2012 · 0d339d0 · 0d339d0
1 parent 9a25c4e
commit 0d339d0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/media/webrtc/trunk/src/build/common.gypi b/media/webrtc/trunk/src/build/common.gypi
@@ -159,13 +159,15 @@
               'WEBRTC_ARCH_ARM_V7',
               'WEBRTC_DETECT_ARM_NEON',
             ],
-          }],
-          ['arm_neon==1', {
-            'defines': [
-              'WEBRTC_ARCH_ARM_NEON',
-            ],
-            'defines!': [
-              'WEBRTC_DETECT_ARM_NEON',
+            'conditions': [
+              ['arm_neon==1', {
+                'defines': [
+                  'WEBRTC_ARCH_ARM_NEON',
+                ],
+                'defines!': [
+                  'WEBRTC_DETECT_ARM_NEON',
+                ],
+              }],
             ],
           }],
         ],

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
@@ -74,17 +74,19 @@
               'sources!': [
                 'filter_ar_fast_q12.c',
               ],
-            }],
-            ['arm_neon==1', {
-              'sources': [
-                'cross_correlation_neon.s',
-                'downsample_fast_neon.s',
-                'min_max_operations_neon.s',
-                'vector_scaling_operations_neon.s',
-              ],
-              'sources!': [
-                'cross_correlation.c',
-                'downsample_fast.c',
+              'conditions': [
+                ['arm_neon==1', {
+                  'sources': [
+                    'cross_correlation_neon.s',
+                    'downsample_fast_neon.s',
+                    'min_max_operations_neon.s',
+                    'vector_scaling_operations_neon.s',
+                  ],
+                  'sources!': [
+                    'cross_correlation.c',
+                    'downsample_fast.c',
+                  ],
+                }],
               ],
             }],
           ],