Backed out changeset 5b6ef91bfe01 (bug 926838)

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 += [

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 += [
     '..'
 ]
-

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'