Bug 1284800: Fix build fallout from moving libyuv into a subdirectory r=ted
authorRandell Jesup <rjesup@jesup.org>
Fri, 24 Feb 2017 14:01:56 -0500
changeset 344807 c560b9eed8b1
parent 344806 946da1e13208
child 344808 558258e4712a
push id31417
push userkwierso@gmail.com
push date2017-02-25 00:46 +0000
treeherdermozilla-central@f36062d04d16 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1284800
milestone54.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 1284800: Fix build fallout from moving libyuv into a subdirectory r=ted MozReview-Commit-ID: CDMDXqpGueS
build/gyp.mozbuild
dom/canvas/gtest/moz.build
dom/canvas/moz.build
dom/media/encoder/moz.build
dom/media/webrtc/moz.build
gfx/layers/moz.build
gfx/ycbcr/moz.build
media/libyuv/moz.build
media/webrtc/signaling/signaling.gyp
media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
--- a/build/gyp.mozbuild
+++ b/build/gyp.mozbuild
@@ -30,17 +30,17 @@ gyp_vars.update({
     'build_json': 0,
     'build_libjpeg': 0,
     'build_libyuv': 0,
     'build_libvpx': 0,
     'build_ssl': 0,
     'build_json': 0,
     'build_icu': 0,
     'build_opus': 0,
-    'libyuv_dir': '/media/libyuv',
+    'libyuv_dir': '/media/libyuv/libyuv',
     'yuv_disable_avx2': 0 if CONFIG['HAVE_X86_AVX2'] else 1,
     # don't use openssl
     'use_openssl': 0,
 
     'debug': 1 if CONFIG['DEBUG'] else 0,
 
     'use_x11': 1 if CONFIG['MOZ_X11'] else 0,
     'use_glib': 1 if CONFIG['GLIB_LIBS'] else 0,
--- a/dom/canvas/gtest/moz.build
+++ b/dom/canvas/gtest/moz.build
@@ -12,12 +12,12 @@ with Files('*WebGL*'):
 
 UNIFIED_SOURCES += [
     'TestImageBitmapColorUtils.cpp',
     'TestWebGLElementArrayCache.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '/dom/canvas',
-    '/media/libyuv/include'
+    '/media/libyuv/libyuv/include'
 ]
 
 FINAL_LIBRARY = 'xul-gtest'
--- a/dom/canvas/moz.build
+++ b/dom/canvas/moz.build
@@ -205,17 +205,17 @@ LOCAL_INCLUDES += [
     '/dom/workers',
     '/dom/xul',
     '/gfx/gl',
     '/image',
     '/js/xpconnect/src',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
-    '/media/libyuv/include',
+    '/media/libyuv/libyuv/include',
 ]
 
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
 CXXFLAGS += CONFIG['TK_CFLAGS']
 
 LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
 
 if CONFIG['GNU_CXX']:
--- a/dom/media/encoder/moz.build
+++ b/dom/media/encoder/moz.build
@@ -25,17 +25,17 @@ UNIFIED_SOURCES += [
     'TrackEncoder.cpp',
 ]
 
 if CONFIG['MOZ_WEBM_ENCODER']:
     EXPORTS += ['VP8TrackEncoder.h',
     ]
     UNIFIED_SOURCES += ['VP8TrackEncoder.cpp',
     ]
-    LOCAL_INCLUDES += ['/media/libyuv/include']
+    LOCAL_INCLUDES += ['/media/libyuv/libyuv/include']
 
 FINAL_LIBRARY = 'xul'
 
 # These includes are from Android JB, for use of MediaCodec.
 LOCAL_INCLUDES += ['/ipc/chromium/src']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '15':
     LOCAL_INCLUDES += [
--- a/dom/media/webrtc/moz.build
+++ b/dom/media/webrtc/moz.build
@@ -37,17 +37,17 @@ if CONFIG['MOZ_WEBRTC']:
         'RTCIdentityProviderRegistrar.cpp',
     ]
     # MediaEngineWebRTC.cpp needs to be built separately.
     SOURCES += [
         'MediaEngineWebRTC.cpp',
     ]
     LOCAL_INCLUDES += [
         '/dom/base',
-        '/media/libyuv/include',
+        '/media/libyuv/libyuv/include',
         '/media/webrtc/signaling/src/common',
         '/media/webrtc/signaling/src/common/browser_logging',
         '/media/webrtc/trunk',
     ]
 
 XPIDL_SOURCES += [
     'nsITabSource.idl'
 ]
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -447,17 +447,17 @@ IPDL_SOURCES += [
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '/docshell/base',  # for nsDocShell.h
     '/layout/base',    # for TouchManager.h
     '/layout/generic', # for nsTextFrame.h
-    '/media/libyuv/include', # for libyuv.h
+    '/media/libyuv/libyuv/include', # for libyuv.h
 ]
 
 FINAL_LIBRARY = 'xul'
 
 if CONFIG['MOZ_DEBUG']:
     DEFINES['D3D_DEBUG_INFO'] = True
 
 if CONFIG['MOZ_ENABLE_D3D10_LAYER']:
--- a/gfx/ycbcr/moz.build
+++ b/gfx/ycbcr/moz.build
@@ -55,11 +55,11 @@ else:
 if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
     SOURCES += [
         'yuv_row_arm.s',
     ]
     SOURCES += [
         'yuv_convert_arm.cpp',
     ]
 
-LOCAL_INCLUDES += ['/media/libyuv/include']
+LOCAL_INCLUDES += ['/media/libyuv/libyuv/include']
 
 FINAL_LIBRARY = 'xul'
--- a/media/libyuv/moz.build
+++ b/media/libyuv/moz.build
@@ -1,26 +1,26 @@
 # -*- Mode: python; 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/.
 
 include('/build/gyp.mozbuild')
 
-GYP_DIRS += ['.']
+libyuv_non_unified_sources = [
+    'libyuv/source/convert.cc',
+    'libyuv/source/convert_from.cc',
+    'libyuv/source/mjpeg_decoder.cc',
+    'libyuv/source/rotate_argb.cc',
+    'libyuv/source/row_common.cc',
+    'libyuv/source/scale.cc',
+    'libyuv/source/scale_common.cc',
+]
 
-libyuv_non_unified_sources = [
-    'source/convert.cc',
-    'source/convert_from.cc',
-    'source/mjpeg_decoder.cc',
-    'source/rotate_argb.cc',
-    'source/row_common.cc',
-    'source/scale.cc',
-    'source/scale_common.cc',
-]
-GYP_DIRS['.'].input = 'libyuv.gyp'
-GYP_DIRS['.'].variables = gyp_vars
-GYP_DIRS['.'].sandbox_vars['FINAL_LIBRARY'] = 'xul'
-GYP_DIRS['.'].non_unified_sources += libyuv_non_unified_sources
+GYP_DIRS += ['libyuv']
+GYP_DIRS['libyuv'].input = 'libyuv/libyuv.gyp'
+GYP_DIRS['libyuv'].variables = gyp_vars
+GYP_DIRS['libyuv'].sandbox_vars['FINAL_LIBRARY'] = 'xul'
+GYP_DIRS['libyuv'].non_unified_sources += libyuv_non_unified_sources
 
 # We allow warnings for third-party code that can be updated from upstream.
-GYP_DIRS['.'].sandbox_vars['ALLOW_COMPILER_WARNINGS'] = True
+GYP_DIRS['libyuv'].sandbox_vars['ALLOW_COMPILER_WARNINGS'] = True
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@@ -71,17 +71,17 @@
         './src/media-conduit',
         './src/mediapipeline',
         './src/peerconnection',
         './src/sdp/sipcc',
         '../../../dom/base',
         '../../../dom/media',
         '../../../media/mtransport',
         '../trunk',
-        '../../libyuv/include',
+        '../../libyuv/libyuv/include',
         '../../mtransport/third_party/nrappkit/src/util/libekr',
       ],
 
       #
       # DEPENDENCIES
       #
       'dependencies': [
       ],
--- a/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
@@ -16,17 +16,17 @@
       'type': 'static_library',
       'dependencies': [
         '<(webrtc_root)/common.gyp:webrtc_common',
         '<(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',
       ],
       'include_dirs': [
-        '../../../../../../../libyuv/include',
+        '../../../../../../../libyuv/libyuv/include',
       ],
       'conditions': [
         ['build_libvpx==1', {
           'dependencies': [
             '<(libvpx_dir)/libvpx.gyp:libvpx_new',
           ],
         },{
           'link_settings': {