Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(620)

Unified Diff: webrtc/build/common.gypi

Issue 1607463002: Declare that rent_a_codec depends on the audio codecs (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: gn refactoring Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/BUILD.gn » ('j') | webrtc/modules/audio_coding/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/build/common.gypi
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 2c24963f4f3a9898e0a2953741121172ab2523b0..14f7e9a4a368ba300dc56e0d7f5bbad9617ac0ae 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -16,13 +16,23 @@
'variables': {
# This will already be set to zero by supplement.gypi
'build_with_chromium%': 1,
+
+ # Enable to use the Mozilla internal settings.
+ 'build_with_mozilla%': 0,
},
'build_with_chromium%': '<(build_with_chromium)',
-
- # Enable to use the Mozilla internal settings.
- 'build_with_mozilla%': 0,
+ 'build_with_mozilla%': '<(build_with_mozilla%)',
+ 'include_opus%': 1,
'conditions': [
+
+ # Include the iLBC audio codec?
+ ['build_with_chromium==1 or build_with_mozilla==1', {
+ 'include_ilbc%': 0,
+ }, {
+ 'include_ilbc%': 1,
+ }],
+
['build_with_chromium==1', {
'webrtc_root%': '<(DEPTH)/third_party/webrtc',
'apk_tests_path%': '<(DEPTH)/third_party/webrtc/build/apk_tests_noop.gyp',
@@ -41,17 +51,9 @@
'modules_java_gyp_path%': '<(modules_java_gyp_path)',
'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8',
'webrtc_vp9_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp9',
- 'include_opus%': 1,
+ 'include_ilbc%': '<(include_ilbc)',
+ 'include_opus%': '<(include_opus)',
'opus_dir%': '<(DEPTH)/third_party/opus',
-
- # Include the iLBC audio codec?
- 'conditions': [
- ['build_with_chromium==1 or build_with_mozilla==1', {
- 'include_ilbc%': 0,
- }, {
- 'include_ilbc%': 1,
- }],
- ],
},
'build_with_chromium%': '<(build_with_chromium)',
'build_with_mozilla%': '<(build_with_mozilla)',
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/BUILD.gn » ('j') | webrtc/modules/audio_coding/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698