diff --git a/config/external/moz.build b/config/external/moz.build
index 370f917f83b5..c4a79514af8f 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -37,7 +37,7 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
 if not CONFIG['MOZ_NATIVE_PNG']:
     external_dirs += ['media/libpng']
 
-if CONFIG['ARM_ARCHITECTURE']:
+if CONFIG['CPU_ARCH'] == 'arm':
     external_dirs += ['media/openmax_dl']
 
 external_dirs += [
diff --git a/dom/media/webaudio/AnalyserNode.cpp b/dom/media/webaudio/AnalyserNode.cpp
index 129f3b6db14d..3071b0ab6cdc 100644
--- a/dom/media/webaudio/AnalyserNode.cpp
+++ b/dom/media/webaudio/AnalyserNode.cpp
@@ -255,7 +255,7 @@ AnalyserNode::FFTAnalysis()
   if (mWriteIndex == 0) {
     inputBuffer = mBuffer.Elements();
   } else {
-    if (tmpBuffer.SetLength(FftSize())) {
+    if (!tmpBuffer.SetLength(FftSize())) {
       return false;
     }
     inputBuffer = tmpBuffer.Elements();
@@ -301,13 +301,13 @@ AnalyserNode::AllocateBuffer()
 {
   bool result = true;
   if (mBuffer.Length() != FftSize()) {
-    if (mBuffer.SetLength(FftSize())) {
+    if (!mBuffer.SetLength(FftSize())) {
       return false;
     }
     memset(mBuffer.Elements(), 0, sizeof(float) * FftSize());
     mWriteIndex = 0;
 
-    if (mOutputBuffer.SetLength(FrequencyBinCount())) {
+    if (!mOutputBuffer.SetLength(FrequencyBinCount())) {
       return false;
     }
     memset(mOutputBuffer.Elements(), 0, sizeof(float) * FrequencyBinCount());
diff --git a/dom/media/webaudio/moz.build b/dom/media/webaudio/moz.build
index 97cf7c912308..9b2ede5c9848 100644
--- a/dom/media/webaudio/moz.build
+++ b/dom/media/webaudio/moz.build
@@ -108,6 +108,9 @@ UNIFIED_SOURCES += [
 if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']:
     SOURCES += ['AudioNodeEngineNEON.cpp']
     SOURCES['AudioNodeEngineNEON.cpp'].flags += ['-mfpu=neon']
+    LOCAL_INCLUDES += [
+        '/media/openmax_dl/dl/api/'
+    ]
 
 FAIL_ON_WARNINGS = True
 
@@ -117,3 +120,4 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '..'
 ]
+
diff --git a/media/openmax_dl/dl/moz.build b/media/openmax_dl/dl/moz.build
index c250096a06e1..2ec083fc452d 100644
--- a/media/openmax_dl/dl/moz.build
+++ b/media/openmax_dl/dl/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']:
-    MODULE = 'openmax_dl'
+    Library('openmax_dl')
 
     EXPORTS.dl.api += [
         'api/armCOMM_s.h',
@@ -75,10 +75,11 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']:
         'sp/src/omxSP_FFTInv_CToC_SC32_Sfs_s.S',
     ]
 
-    LIBRARY_NAME = 'openmax_dl'
-
     LOCAL_INCLUDES += [
-        '..'
+        '..',
+        'api'
     ]
 
     DEFINES['BIG_FFT_TABLE'] = True
+
+    FINAL_LIBRARY = 'xul'