generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure WEBRTC_MODULE_UTILITY_VIDEO is undefined for enable_video==0.

Browse Source 
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
This commit is contained in:
andrew@webrtc.org 2013-12-09 16:23:00 +00:00
parent 5e13ac967b
commit de7c9e8884
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/build/common.gypi
View File

@ -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.

6
webrtc/modules/media_file/source/media_file.gypi
View File

@ -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',

4
webrtc/modules/utility/source/utility.gypi
View File

@ -39,10 +39,6 @@
],
'conditions': [
['enable_video==1', {
# Adds support for video recording.
'defines': [
'WEBRTC_MODULE_UTILITY_VIDEO',
],
'dependencies': [
'webrtc_video_coding',
],