From 7d9112cbc4a980c505572012dd9253e14f0d8ad4 Mon Sep 17 00:00:00 2001 From: kjellander Date: Mon, 29 Feb 2016 06:14:46 -0800 Subject: [PATCH] Make it possible to exclude device management code from rtc_media target. Chromium doesn't use the device managment code in webrtc/media so we need a way to turn it off in order to eliminate Chromium's src/third_party/libjingle/libjingle.gyp BUG=webrtc:4256 NOTRY=True TESTED=Trybots + successfully compiled with GYP_DEFINES=include_internal_device_management=0 webrtc/build/gyp_webrtc ninja -C out/Debug rtc_media Review URL: https://codereview.webrtc.org/1693803002 Cr-Commit-Position: refs/heads/master@{#11816} --- webrtc/build/common.gypi | 4 ++ webrtc/media/media.gyp | 88 +++++++++++++++++++++++----------------- 2 files changed, 55 insertions(+), 37 deletions(-) diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index 3459a55d09..bab0cec97e 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -181,6 +181,9 @@ # Exclude internal ADM since Chromium uses its own IO handling. 'include_internal_audio_device%': 0, + # Exclude device management code since Chromium has its own. + 'include_internal_device_management%': 0, + # Remove tests for Chromium to avoid slowing down GYP generation. 'include_tests%': 0, 'restrict_webrtc_logging%': 1, @@ -193,6 +196,7 @@ 'include_pulse_audio%': 1, 'include_internal_audio_device%': 1, + 'include_internal_device_management%': 1, 'include_tests%': 1, 'restrict_webrtc_logging%': 0, }], diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp index e4960e16c9..2a5295734a 100644 --- a/webrtc/media/media.gyp +++ b/webrtc/media/media.gyp @@ -77,9 +77,6 @@ 'base/yuvframegenerator.cc', 'base/yuvframegenerator.h', 'devices/deviceinfo.h', - 'devices/devicemanager.cc', - 'devices/devicemanager.h', - 'devices/dummydevicemanager.h', 'devices/videorendererfactory.h', 'engine/nullwebrtcvideoengine.h', 'engine/simulcast.cc', @@ -124,6 +121,17 @@ 4389, # signed/unsigned mismatch. ], 'conditions': [ + ['include_internal_device_management==1', { + 'sources': [ + 'devices/devicemanager.cc', + 'devices/devicemanager.h', + ], + }, { + 'sources': [ + 'devices/dummydevicemanager.cc', + 'devices/dummydevicemanager.h', + ], + }], ['build_libyuv==1', { 'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',], }], @@ -158,7 +166,7 @@ '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl', ], }], - ['OS=="linux"', { + ['OS=="linux" and include_internal_device_management==1', { 'sources': [ 'devices/libudevsymboltable.cc', 'devices/libudevsymboltable.h', @@ -168,17 +176,6 @@ 'devices/v4llookup.cc', 'devices/v4llookup.h', ], - 'conditions': [ - ['use_gtk==1', { - 'sources': [ - 'devices/gtkvideorenderer.cc', - 'devices/gtkvideorenderer.h', - ], - 'cflags': [ - '