Bug 1332139: make system changes to fix libvpx include paths (prefer media/libvpx) r=ted
authorRandell Jesup <rjesup@jesup.org>
Fri, 20 Jan 2017 10:42:32 -0500
changeset 375360 bf810166549842797d2605be2442977bce4d008a
parent 375359 004ad2adfd6eb097cf6e32d866b2544db9a22804
child 375361 f5773f7823898e84a05a6900f0fddead497f696d
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)
reviewersted
bugs1332139
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 1332139: make system changes to fix libvpx include paths (prefer media/libvpx) r=ted
build/gyp.mozbuild
media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9.gyp
--- a/build/gyp.mozbuild
+++ b/build/gyp.mozbuild
@@ -104,8 +104,11 @@ if CONFIG['ARM_ARCH']:
 
 # Don't try to compile ssse3/sse4.1 code if toolchain doesn't support
 if CONFIG['INTEL_ARCHITECTURE']:
     if not CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3'] or not CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSE4_1']:
         gyp_vars['yuv_disable_asm'] = 1
 
 if CONFIG['MACOS_SDK_DIR']:
     gyp_vars['mac_sdk_path'] = CONFIG['MACOS_SDK_DIR']
+
+if not CONFIG['MOZ_SYSTEM_LIBVPX']:
+    gyp_vars['libvpx_dir'] =  '/media/libvpx/libvpx'
--- a/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9.gyp
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9.gyp
@@ -17,16 +17,17 @@
       'conditions': [
         ['build_libvpx==1', {
           'dependencies': [
             '<(libvpx_dir)/libvpx.gyp:libvpx_new',
           ],
         }, {
           'include_dirs': [
             '$(MOZ_LIBVPX_CFLAGS)',
+            '<(libvpx_dir)',
           ],
 	}],
       ],
       'dependencies': [
         '<(webrtc_root)/common_video/common_video.gyp:common_video',
         '<(webrtc_root)/modules/video_coding/utility/video_coding_utility.gyp:video_coding_utility',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],