From de7c9e8884234cf948552484fde1bdd5d4175e8f Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Mon, 9 Dec 2013 16:23:00 +0000 Subject: [PATCH] Ensure WEBRTC_MODULE_UTILITY_VIDEO is undefined for enable_video==0. Move the logic to common.gypi to reduce the chance of the define being unprotected in the future. BUG=b/12018143 TESTED=git try, and local Linux build with -Denable_video=0 R=stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/5309004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5244 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/build/common.gypi | 3 +++ webrtc/modules/media_file/source/media_file.gypi | 6 ------ webrtc/modules/utility/source/utility.gypi | 4 ---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index c232f2b8f8..b5fa785a35 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -161,6 +161,9 @@ 'WEBRTC_MOZILLA_BUILD', ], }], + ['enable_video==1', { + 'defines': ['WEBRTC_MODULE_UTILITY_VIDEO',], + }], ['build_with_chromium==1', { 'defines': [ # Changes settings for Chromium build. diff --git a/webrtc/modules/media_file/source/media_file.gypi b/webrtc/modules/media_file/source/media_file.gypi index 3add36c1bc..37df13c5ac 100644 --- a/webrtc/modules/media_file/source/media_file.gypi +++ b/webrtc/modules/media_file/source/media_file.gypi @@ -14,9 +14,6 @@ 'dependencies': [ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', ], - 'defines': [ - 'WEBRTC_MODULE_UTILITY_VIDEO', # for compiling support for video recording - ], 'include_dirs': [ '../interface', '../../interface', @@ -26,9 +23,6 @@ '../interface', '../../interface', ], - 'defines': [ - 'WEBRTC_MODULE_UTILITY_VIDEO', - ], }, 'sources': [ '../interface/media_file.h', diff --git a/webrtc/modules/utility/source/utility.gypi b/webrtc/modules/utility/source/utility.gypi index 1c97680442..2f09657da8 100644 --- a/webrtc/modules/utility/source/utility.gypi +++ b/webrtc/modules/utility/source/utility.gypi @@ -39,10 +39,6 @@ ], 'conditions': [ ['enable_video==1', { - # Adds support for video recording. - 'defines': [ - 'WEBRTC_MODULE_UTILITY_VIDEO', - ], 'dependencies': [ 'webrtc_video_coding', ],