Bug 1284800: Fix build fallout from moving libyuv into a subdirectory…

… r=ted MozReview-Commit-ID: CDMDXqpGueS
dothq · Feb 24, 2017 · 8ad25a6 · 8ad25a6
1 parent 444c7b0
commit 8ad25a6
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 23 deletions.
diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild
@@ -35,7 +35,7 @@ gyp_vars.update({
     '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,

diff --git a/dom/canvas/gtest/moz.build b/dom/canvas/gtest/moz.build
@@ -17,7 +17,7 @@ UNIFIED_SOURCES += [
 
 LOCAL_INCLUDES += [
     '/dom/canvas',
-    '/media/libyuv/include'
+    '/media/libyuv/libyuv/include'
 ]
 
 FINAL_LIBRARY = 'xul-gtest'
diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build
@@ -210,7 +210,7 @@ LOCAL_INCLUDES += [
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
-    '/media/libyuv/include',
+    '/media/libyuv/libyuv/include',
 ]
 
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

diff --git a/dom/media/encoder/moz.build b/dom/media/encoder/moz.build
@@ -30,7 +30,7 @@ if CONFIG['MOZ_WEBM_ENCODER']:
     ]
     UNIFIED_SOURCES += ['VP8TrackEncoder.cpp',
     ]
-    LOCAL_INCLUDES += ['/media/libyuv/include']
+    LOCAL_INCLUDES += ['/media/libyuv/libyuv/include']
 
 FINAL_LIBRARY = 'xul'
 

diff --git a/dom/media/webrtc/moz.build b/dom/media/webrtc/moz.build
@@ -42,7 +42,7 @@ if CONFIG['MOZ_WEBRTC']:
     ]
     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',

diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
@@ -452,7 +452,7 @@ 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'

diff --git a/gfx/ycbcr/moz.build b/gfx/ycbcr/moz.build
@@ -60,6 +60,6 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
         'yuv_convert_arm.cpp',
     ]
 
-LOCAL_INCLUDES += ['/media/libyuv/include']
+LOCAL_INCLUDES += ['/media/libyuv/libyuv/include']
 
 FINAL_LIBRARY = 'xul'
diff --git a/media/libyuv/moz.build b/media/libyuv/moz.build
@@ -6,21 +6,21 @@
 
 include('/build/gyp.mozbuild')
 
-GYP_DIRS += ['.']
-
 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',
+    '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',
 ]
-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
diff --git a/media/webrtc/signaling/signaling.gyp b/media/webrtc/signaling/signaling.gyp
@@ -76,7 +76,7 @@
         '../../../dom/media',
         '../../../media/mtransport',
         '../trunk',
-        '../../libyuv/include',
+        '../../libyuv/libyuv/include',
         '../../mtransport/third_party/nrappkit/src/util/libekr',
       ],
 

diff --git a/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8.gyp b/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
@@ -21,7 +21,7 @@
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],
       'include_dirs': [
-        '../../../../../../../libyuv/include',
+        '../../../../../../../libyuv/libyuv/include',
       ],
       'conditions': [
         ['build_libvpx==1', {