Bug 1337250 - Fix libvpx build on non-Android ARM. r=froydnj a=gchang
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 07 Feb 2017 13:55:08 +0900
changeset 359059 bc736e4fab076b947c7918dba41af3d015e3ad22
parent 359058 eabe078e61706f56a0db391da2076717c99ac318
child 359060 7bab8cf2a1cf936aeeceb61d8f791ff8f4e9223b
push id10707
push usercbook@mozilla.com
push dateThu, 09 Feb 2017 10:11:53 +0000
treeherdermozilla-aurora@bc736e4fab07 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj, gchang
bugs1337250
milestone53.0a2
Bug 1337250 - Fix libvpx build on non-Android ARM. r=froydnj a=gchang
media/libvpx/moz.build
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -34,17 +34,20 @@ elif CONFIG['CPU_ARCH'] == 'x86':
     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 ]
+    ASFLAGS += [
+        '-I%s/media/libvpx/config/linux/arm/' % TOPSRCDIR,
+        '-I%s/libvpx' % OBJDIR,
+    ]
     CFLAGS += [ '-I%s/media/libvpx/config/linux/arm/' % TOPSRCDIR ]
 
     arm_asm_files = files['ARM_SOURCES']
 
     if CONFIG['VPX_AS_CONVERSION']:
         SOURCES += sorted([
             "!%s.S" % f if f.endswith('.asm') else f for f in arm_asm_files
         ])
@@ -83,18 +86,16 @@ if CONFIG['OS_TARGET'] == 'Android':
     # the OS they're on, so do it for them.
     DEFINES['__linux__'] = True
 
     if not CONFIG['MOZ_WEBRTC']:
         SOURCES += [
             '%%%s/sources/android/cpufeatures/cpu-features.c' % CONFIG['ANDROID_NDK'],
         ]
 
-    ASFLAGS += ['-I%s/libvpx' % OBJDIR]
-
 if CONFIG['CLANG_CL'] or not CONFIG['_MSC_VER']:
     for f in SOURCES:
         if f.endswith('.c'):
             if 'sse2.c' in f:
                 SOURCES[f].flags += CONFIG['SSE2_FLAGS']
             if 'ssse3.c' in f:
                 SOURCES[f].flags += ['-mssse3']
             if 'sse4.c' in f: