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

Unified Diff: webrtc/build/common.gypi

Issue 1578953003: Add a gyp/gn variable for whether to use iLBC or not (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: New and improved version 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/build/webrtc.gni » ('j') | no next file with comments »
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 9fa3ce31933f93e78bfd888a47591e291536b3e4..1a1d40ebeea6e2a179076305c93819ebd0b956f1 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -19,6 +19,9 @@
},
'build_with_chromium%': '<(build_with_chromium)',
+ # Enable to use the Mozilla internal settings.
+ 'build_with_mozilla%': 0,
+
'conditions': [
['build_with_chromium==1', {
'webrtc_root%': '<(DEPTH)/third_party/webrtc',
@@ -32,6 +35,7 @@
],
},
'build_with_chromium%': '<(build_with_chromium)',
+ 'build_with_mozilla%': '<(build_with_mozilla)',
'webrtc_root%': '<(webrtc_root)',
'apk_tests_path%': '<(apk_tests_path)',
'modules_java_gyp_path%': '<(modules_java_gyp_path)',
@@ -40,8 +44,14 @@
'include_opus%': 1,
'opus_dir%': '<(DEPTH)/third_party/opus',
- # Enable to use the Mozilla internal settings.
- 'build_with_mozilla%': 0,
+ # 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)',
@@ -50,6 +60,7 @@
'modules_java_gyp_path%': '<(modules_java_gyp_path)',
'webrtc_vp8_dir%': '<(webrtc_vp8_dir)',
'webrtc_vp9_dir%': '<(webrtc_vp9_dir)',
+ 'include_ilbc%': '<(include_ilbc)',
'include_opus%': '<(include_opus)',
'rtc_relative_path%': 1,
'external_libraries%': '0',
« no previous file with comments | « no previous file | webrtc/build/webrtc.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698