zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding build_opus as a switch in GYP.

Browse Source 
This is to allow not building Opus. On non-chromium non-gyp chases, one can let WebRTC depend on other Opus builds.

BUG=
R=kjellander@webrtc.org, tina.legrand@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/43739004

Cr-Commit-Position: refs/heads/master@{#8754}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8754 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
minyue@webrtc.org
2015-03-17 14:04:56 +00:00
parent c383c24c2b
commit 7c112f3e5a
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/audio_coding/BUILD.gn
View File

@ -666,14 +666,14 @@ source_set("webrtc_opus") {
deps = [ ":audio_encoder_interface" ]
if (build_with_mozilla) {
include_dirs = [ getenv("DIST") + "/include/opus" ]
} else {
if (rtc_build_opus) {
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps += [ rtc_opus_dir ]
forward_dependent_configs_from = [ rtc_opus_dir ]
} else if (build_with_mozilla) {
include_dirs = [ getenv("DIST") + "/include/opus" ]
}
}

16
webrtc/modules/audio_coding/codecs/opus/opus.gypi
View File

@ -12,12 +12,7 @@
'target_name': 'webrtc_opus',
'type': 'static_library',
'conditions': [
['build_with_mozilla==1', {
# Mozilla provides its own build of the opus library.
'include_dirs': [
'$(DIST)/include/opus',
]
}, {
['build_opus==1', {
'dependencies': [
'<(opus_dir)/opus.gyp:opus'
],
@ -30,6 +25,15 @@
'<(opus_dir)/src/celt',
],
},
}, {
'conditions': [
['build_with_mozilla==1', {
# Mozilla provides its own build of the opus library.
'include_dirs': [
'$(DIST)/include/opus',
]
}],
],
}],
],
'dependencies': [