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

Unified Diff: build/common.gypi

Issue 22408006: Properly set loopback device ID for system audio capture. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Give a valid name to the system audio capture device. Created 7 years, 4 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 | chrome/browser/media/media_capture_devices_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 29f127804404af7cd425b54f8569bf3f7aba7c97..4b36fdf37d2e7625e7d4ccab556e43d60c091e5c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -27,6 +27,9 @@
# Whether or not we are building the Ash shell.
'use_ash%': 0,
+ # Whether or not we are using CRAS, the ChromeOS Audio Server.
+ 'use_cras%': 0,
+
# Use a raw surface abstraction.
'use_ozone%': 0,
},
@@ -34,6 +37,7 @@
'chromeos%': '<(chromeos)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
+ 'use_cras%': '<(use_cras)',
'use_ozone%': '<(use_ozone)',
# Whether we are using Views Toolkit
@@ -98,6 +102,7 @@
'chromeos%': '<(chromeos)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
+ 'use_cras%': '<(use_cras)',
'use_ozone%': '<(use_ozone)',
'use_openssl%': '<(use_openssl)',
'enable_viewport%': '<(enable_viewport)',
@@ -179,6 +184,7 @@
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
+ 'use_cras%': '<(use_cras)',
'use_ozone%': '<(use_ozone)',
'use_openssl%': '<(use_openssl)',
'enable_viewport%': '<(enable_viewport)',
@@ -755,6 +761,7 @@
'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
+ 'use_cras%': '<(use_cras)',
'use_openssl%': '<(use_openssl)',
'use_nss%': '<(use_nss)',
'os_bsd%': '<(os_bsd)',
@@ -1928,6 +1935,9 @@
['use_ash==1', {
'defines': ['USE_ASH=1'],
}],
+ ['use_cras==1', {
+ 'defines': ['USE_CRAS=1'],
+ }],
['use_ozone==1', {
'defines': ['USE_OZONE=1'],
}],
« no previous file with comments | « no previous file | chrome/browser/media/media_capture_devices_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698