Bug 924107 - Make dist/include available in all of the WebRTC code; r=jesup,glandium
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 15 Oct 2013 15:08:43 -0400
changeset 165589 489e596e0359b0fe463e3a56839adaa0cce553f1
parent 165588 51170e07d7e9ac16a8d6cbae6bb95bc9ce8d5bc8
child 165590 ce100e906a6eb1aa10969880d978a203bdfd0aff
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, glandium
bugs924107
milestone27.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 924107 - Make dist/include available in all of the WebRTC code; r=jesup,glandium
media/webrtc/signaling/signaling.gyp
media/webrtc/trunk/third_party/libyuv/libyuv.gyp
media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
media/webrtc/trunk/webrtc/common_audio/common_audio.gyp
media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@@ -48,17 +48,16 @@
         './src/softphonewrapper',
         './src/peerconnection',
         './include',
         './src/sipcc/include',
         './src/sipcc/cpr/include',
         '../../../ipc/chromium/src',
         '../../../ipc/chromium/src/base/third_party/nspr',
         '../../../xpcom/base',
-        '$(DEPTH)/dist/include',
         '../../../dom/base',
         '../../../content/media',
         '../../../media/mtransport',
         '../trunk',
         '../trunk/webrtc/video_engine/include',
         '../trunk/webrtc/voice_engine/include',
         '../trunk/webrtc/modules/interface',
         '../trunk/webrtc/peerconnection',
@@ -281,17 +280,16 @@
         './src/sipcc/core/ccapp',
         './src/sipcc/core/sdp',
         './src/sipcc/core/gsm/h',
         './src/sipcc/plat/common',
         '../../../media/mtransport',
         '../../../dom/base',
         '../trunk/third_party/libsrtp/srtp/include',
         '../trunk/third_party/libsrtp/srtp/crypto/include',
-        '$(DEPTH)/dist/include',
         # Danger: this is to include config.h. This could be bad.
         '../trunk/third_party/libsrtp/config',
       ],
 
       #
       # DEPENDENCIES
       #
       'dependencies': [
--- a/media/webrtc/trunk/third_party/libyuv/libyuv.gyp
+++ b/media/webrtc/trunk/third_party/libyuv/libyuv.gyp
@@ -22,23 +22,16 @@
              '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
           ],
         }, {
           'link_settings': {
             'libraries': [
               '-ljpeg',
             ],
           },
-          'conditions': [
-            ['build_with_mozilla==1', {
-              'include_dirs': [
-                '$(DEPTH)/dist/include',
-              ],
-            }],
-          ],
         }],
       ],
       'defines': [
         'HAVE_JPEG',
         # 'LIBYUV_BUILDING_SHARED_LIBRARY',
       ],
       'include_dirs': [
         'include',
@@ -51,26 +44,16 @@
         ],
       },
       'conditions': [
         ['yuv_disable_asm==1', {
           'defines': [
             'YUV_DISABLE_ASM',
           ],
         }],
-        ['build_with_mozilla==1', {
-          'include_dirs': [
-            '$(DEPTH)/dist/include',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '$(DEPTH)/dist/include',
-            ],
-          },
-        }],
       ],
       'sources': [
         # includes.
         'include/libyuv.h',
         'include/libyuv/basic_types.h',
         'include/libyuv/compare.h',
         'include/libyuv/convert.h',
         'include/libyuv/convert_argb.h',
--- a/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
+++ b/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
@@ -71,20 +71,18 @@ ifeq (WINNT,$(OS_TARGET))
 # These get set via VC project file settings for normal GYP builds.
 DEFINES += -DUNICODE -D_UNICODE
 LOCAL_INCLUDES += -I"$(MOZ_DIRECTX_SDK_PATH)/include"
 endif
 
 # Don't use STL wrappers when compiling Google code.
 STL_FLAGS =
 
-# Skip Mozilla-specific include locations.
-# Specific GYP files can add them back by adding
-# $(DIST)/include to their includes.
-INCLUDES = -I. $(LOCAL_INCLUDES)
+# Skip most Mozilla-specific include locations.
+INCLUDES = -I. $(LOCAL_INCLUDES) -I$(DEPTH)/dist/include
 
 # Ensure that subdirs for sources get created before compiling
 ifdef OBJS
 SUB_SRCDIRS := $(addsuffix .dirstamp,$(addprefix $(CURDIR)/,$(sort $(dir $(OBJS)))))
 $(OBJS): $(SUB_SRCDIRS)
 $(SUB_SRCDIRS):
 	$(MKDIR) -p $(dir $@)
 	touch $@
--- a/media/webrtc/trunk/webrtc/common_audio/common_audio.gyp
+++ b/media/webrtc/trunk/webrtc/common_audio/common_audio.gyp
@@ -16,36 +16,22 @@
       'type': 'static_library',
       'dependencies': [
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],
       'include_dirs': [
         'resampler/include',
         'signal_processing/include',
       ],
-      'target_conditions': [
-        ['build_with_mozilla==1', {
-          'include_dirs': [
-            '$(DEPTH)/dist/include',
-          ],
-        }],
-      ],
       'direct_dependent_settings': {
         'include_dirs': [
           'resampler/include',
           'signal_processing/include',
           'vad/include',
         ],
-        'conditions': [
-          ['build_with_mozilla==1', {
-            'include_dirs': [
-              '$(DEPTH)/dist/include',
-            ],
-          }],
-        ],
       },
       'sources': [
         'audio_util.cc',
         'include/audio_util.h',
         'resampler/include/push_resampler.h',
         'resampler/include/resampler.h',
         'resampler/push_resampler.cc',
         'resampler/push_sinc_resampler.cc',
--- a/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
@@ -20,18 +20,16 @@
       'cflags_mozilla': [
         '$(NSPR_CFLAGS)',
       ],
 
       'include_dirs': [
         'include',
         '../interface',
         '<(webrtc_root)/common_video/libyuv/include',
-# added for mozilla for use_system_libjpeg
-        '$(DIST)/include',
       ],
       'sources': [
         'device_info_impl.cc',
         'device_info_impl.h',
         'include/video_capture.h',
         'include/video_capture_defines.h',
         'include/video_capture_factory.h',
         'video_capture_config.h',
--- a/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
@@ -26,19 +26,16 @@
         '<(webrtc_root)/modules/interface',
       ],
       'conditions': [
         ['build_libvpx==1', {
           'dependencies': [
             '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
           ],
         },{
-          'include_dirs': [
-            '$(DIST)/include',
-          ],
           'link_settings': {
             'libraries': [
               '$(LIBVPX_OBJ)/libvpx.a',
             ],
           },
         }],
       ],
       'direct_dependent_settings': {