Bug 1330873 - Fallback to vpx_config.* from Linux on Tier3 platforms. r=jesup
authorJan Beich <jbeich@FreeBSD.org>
Fri, 13 Jan 2017 05:28:52 +0000
changeset 374375 6d5214fa22767f4cf7617633daefa11b41e605d0
parent 374374 721d939dc97b1779c2fbeee125356a99564e9b4e
child 374376 47e7a628e4eb7a4e4209d4fce83387f9508927b0
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1330873
milestone53.0a1
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
Bug 1330873 - Fallback to vpx_config.* from Linux on Tier3 platforms. r=jesup MozReview-Commit-ID: J67mcTMKL4e
media/libvpx/moz.build
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -11,37 +11,37 @@ include('sources.mozbuild')
 
 if CONFIG['VPX_USE_YASM']:
     USE_YASM = True
 
 # Linux, Mac and Win share file lists for x86* but not configurations.
 if CONFIG['CPU_ARCH'] == 'x86_64':
     EXPORTS.vpx += files['X64_EXPORTS']
     SOURCES += files['X64_SOURCES']
-    if CONFIG['OS_TARGET'] == 'Linux':
-        ASFLAGS += [ '-I%s/media/libvpx/config/linux/x64/' % TOPSRCDIR ]
-        CFLAGS += [ '-I%s/media/libvpx/config/linux/x64/' % TOPSRCDIR ]
-    elif CONFIG['OS_TARGET'] == 'WINNT':
+    if CONFIG['OS_TARGET'] == 'WINNT':
         ASFLAGS += [ '-I%s/media/libvpx/config/win/x64/' % TOPSRCDIR ]
         CFLAGS += [ '-I%s/media/libvpx/config/win/x64/' % TOPSRCDIR ]
     elif CONFIG['OS_TARGET'] == 'Darwin':
         ASFLAGS += [ '-I%s/media/libvpx/config/mac/x64/' % TOPSRCDIR ]
         CFLAGS += [ '-I%s/media/libvpx/config/mac/x64/' % TOPSRCDIR ]
+    else: # Android, Linux, BSDs, etc.
+        ASFLAGS += [ '-I%s/media/libvpx/config/linux/x64/' % TOPSRCDIR ]
+        CFLAGS += [ '-I%s/media/libvpx/config/linux/x64/' % TOPSRCDIR ]
 elif CONFIG['CPU_ARCH'] == 'x86':
     EXPORTS.vpx += files['IA32_EXPORTS']
     SOURCES += files['IA32_SOURCES']
-    if CONFIG['OS_TARGET'] == 'Linux' or CONFIG['OS_TARGET'] == 'Android':
-        ASFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ]
-        CFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ]
-    elif CONFIG['OS_TARGET'] == 'WINNT':
+    if CONFIG['OS_TARGET'] == 'WINNT':
         ASFLAGS += [ '-I%s/media/libvpx/config/win/ia32/' % TOPSRCDIR ]
         CFLAGS += [ '-I%s/media/libvpx/config/win/ia32/' % TOPSRCDIR ]
     elif CONFIG['OS_TARGET'] == 'Darwin':
         ASFLAGS += [ '-I%s/media/libvpx/config/mac/ia32/' % TOPSRCDIR ]
         CFLAGS += [ '-I%s/media/libvpx/config/mac/ia32/' % TOPSRCDIR ]
+    else: # Android, Linux, BSDs, etc.
+        ASFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ]
+        CFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ]
 elif CONFIG['CPU_ARCH'] == 'arm':
     EXPORTS.vpx += files['ARM_EXPORTS']
     ASFLAGS += [ '-I%s/media/libvpx/config/linux/arm/' % TOPSRCDIR ]
     CFLAGS += [ '-I%s/media/libvpx/config/linux/arm/' % TOPSRCDIR ]
 
     arm_asm_files = files['ARM_SOURCES']
 
     if CONFIG['VPX_AS_CONVERSION']: