From db887fe217c4700deece1f3725097dee4ff4bc62 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Tue, 5 May 2015 15:51:16 +0200
Subject: [PATCH] Backed out changeset 5b6ef91bfe01 (bug 926838)

---
 config/external/moz.build     | 2 +-
 dom/media/webaudio/moz.build  | 4 ----
 media/openmax_dl/dl/moz.build | 9 ++++-----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/config/external/moz.build b/config/external/moz.build
index c4a79514af8f..370f917f83b5 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['CPU_ARCH'] == 'arm':
+if CONFIG['ARM_ARCHITECTURE']:
     external_dirs += ['media/openmax_dl']
 
 external_dirs += [
diff --git a/dom/media/webaudio/moz.build b/dom/media/webaudio/moz.build
index 9b2ede5c9848..97cf7c912308 100644
--- a/dom/media/webaudio/moz.build
+++ b/dom/media/webaudio/moz.build
@@ -108,9 +108,6 @@ 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
 
@@ -120,4 +117,3 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '..'
 ]
-
diff --git a/media/openmax_dl/dl/moz.build b/media/openmax_dl/dl/moz.build
index 2ec083fc452d..c250096a06e1 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']:
-    Library('openmax_dl')
+    MODULE = 'openmax_dl'
 
     EXPORTS.dl.api += [
         'api/armCOMM_s.h',
@@ -75,11 +75,10 @@ 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'