Index: webrtc/modules/audio_coding/main/audio_coding_module.gypi |
diff --git a/webrtc/modules/audio_coding/main/audio_coding_module.gypi b/webrtc/modules/audio_coding/main/audio_coding_module.gypi |
index ce86335c678b505849e2c25dca7cfe6774ab367e..1362fba5d515f81968be1166c7ea1aa3634fc3c6 100644 |
--- a/webrtc/modules/audio_coding/main/audio_coding_module.gypi |
+++ b/webrtc/modules/audio_coding/main/audio_coding_module.gypi |
@@ -11,22 +11,34 @@ |
'audio_coding_dependencies': [ |
'cng', |
'g711', |
- 'g722', |
- 'ilbc', |
- 'isac', |
- 'isac_fix', |
'pcm16b', |
- 'red', |
'<(webrtc_root)/common.gyp:webrtc_common', |
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio', |
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', |
], |
'audio_coding_defines': [], |
'conditions': [ |
- ['include_opus==1', { |
+ ['include_opus == 1', { |
kjellander_webrtc
2015/09/22 11:01:28
Please don't use spaces around ==
See https://chro
kwiberg-webrtc
2015/09/22 12:05:14
Very well. But the spaces definitely make the cond
|
'audio_coding_dependencies': ['webrtc_opus',], |
'audio_coding_defines': ['WEBRTC_CODEC_OPUS',], |
}], |
+ ['build_with_mozilla == 0', { |
+ 'conditions': [ |
+ ['target_arch == "arm"', { |
kjellander_webrtc
2015/09/22 11:01:28
... or target_arch=="arm64"
kwiberg-webrtc
2015/09/22 12:05:14
No (see earlier comment).
kjellander_webrtc
2015/09/22 12:35:25
Acknowledged.
|
+ 'audio_coding_dependencies': ['isac_fix',], |
hlundin-webrtc
2015/09/22 09:09:18
I'm not sure about the syntax here. Do these lines
kwiberg-webrtc
2015/09/22 09:37:04
Yes, they add new elements. See https://chromium.g
hlundin-webrtc
2015/09/22 10:05:55
Acknowledged.
|
+ 'audio_coding_defines': ['WEBRTC_CODEC_ISACFX',], |
+ }, { |
+ 'audio_coding_dependencies': ['isac',], |
+ 'audio_coding_defines': ['WEBRTC_CODEC_ISAC',], |
+ }], |
+ ], |
+ 'audio_coding_dependencies': ['g722',], |
+ 'audio_coding_defines': ['WEBRTC_CODEC_G722',], |
+ }], |
+ ['build_with_mozilla == 0 and build_with_chromium == 0', { |
+ 'audio_coding_dependencies': ['ilbc', 'red',], |
+ 'audio_coding_defines': ['WEBRTC_CODEC_ILBC', 'WEBRTC_CODEC_RED',], |
+ }], |
], |
}, |
'targets': [ |