Backed out changeset 5b6ef91bfe01 (bug 926838)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 05 May 2015 15:51:16 +0200
changeset 273723 b1e4712b007ff0e809bec46c63e3254fd4c87a13
parent 273722 376c53019483b6850b61e6d0f0fd407eb38c4e25
child 273724 3fbbaabff67a524d4fdfaedb63a8db21e553af85
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs926838
milestone40.0a1
backs out5b6ef91bfe0133e1d1c7344b464ccb0f39b753dd
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 5b6ef91bfe01 (bug 926838)
config/external/moz.build
dom/media/webaudio/moz.build
media/openmax_dl/dl/moz.build
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -32,17 +32,17 @@ if CONFIG['MOZ_WEBM_ENCODER']:
     external_dirs += ['media/libmkv']
 
 if CONFIG['MOZ_VPX'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
     external_dirs += ['media/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 += [
     'media/kiss_fft',
     'media/libcubeb',
     'media/libogg',
     'media/libopus',
     'media/libtheora',
--- a/dom/media/webaudio/moz.build
+++ b/dom/media/webaudio/moz.build
@@ -103,21 +103,17 @@ UNIFIED_SOURCES += [
     'ThreeDPoint.cpp',
     'WaveShaperNode.cpp',
     'WebAudioUtils.cpp',
 ]
 
 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
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '..'
 ]
-
--- a/media/openmax_dl/dl/moz.build
+++ b/media/openmax_dl/dl/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # 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',
         'api/armOMX.h',
         'api/omxtypes.h',
         'api/omxtypes_s.h',
     ]
 
@@ -70,16 +70,15 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFI
         'sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_s.S',
         'sp/src/omxSP_FFTInv_CCSToR_S32_Sfs_s.S',
         'sp/src/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S',
         'sp/src/omxSP_FFTInv_CToC_FC32_Sfs_s.S',
         'sp/src/omxSP_FFTInv_CToC_SC16_Sfs_s.S',
         'sp/src/omxSP_FFTInv_CToC_SC32_Sfs_s.S',
     ]
 
+    LIBRARY_NAME = 'openmax_dl'
+
     LOCAL_INCLUDES += [
-        '..',
-        'api'
+        '..'
     ]
 
     DEFINES['BIG_FFT_TABLE'] = True
-
-    FINAL_LIBRARY = 'xul'