diff --git a/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi b/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi
index 45a3436d5b..a6a7f97775 100644
--- a/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi
+++ b/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi
@@ -81,7 +81,6 @@
           ],
         }],
         ['target_arch=="arm" and arm_version>=7', {
-          'dependencies': [ 'isac_neon', ],
           'sources': [
             'fix/source/lattice_armv7.S',
             'fix/source/pitch_filter_armv6.S',
@@ -90,6 +89,11 @@
             'fix/source/lattice_c.c',
             'fix/source/pitch_filter_c.c',
           ],
+          'conditions': [
+            ['arm_neon==1 or arm_neon_optional==1', {
+              'dependencies': [ 'isac_neon' ],
+            }],
+          ],
         }],
         ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', {
           'sources': [