diff --git a/src/build/common.gypi b/src/build/common.gypi
index 3d76c1cc69..244175e24e 100644
--- a/src/build/common.gypi
+++ b/src/build/common.gypi
@@ -150,17 +150,13 @@
         ],
         'conditions': [
           ['armv7==1', {
-            'defines': [
-              'WEBRTC_ARCH_ARM_V7',
-              'WEBRTC_DETECT_ARM_NEON',
-            ],
-          }],
-          ['arm_neon==1', {
-            'defines': [
-              'WEBRTC_ARCH_ARM_NEON',
-            ],
-            'defines!': [
-              'WEBRTC_DETECT_ARM_NEON',
+            'defines': ['WEBRTC_ARCH_ARM_V7',],
+            'conditions': [
+              ['arm_neon==1', {
+                'defines': ['WEBRTC_ARCH_ARM_NEON',],
+              }, {
+                'defines': ['WEBRTC_DETECT_ARM_NEON',],
+              }],
             ],
           }],
         ],