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

Unified Diff: media/media_options.gni

Issue 1678033002: Fix audio related GN args handling for Chrome OS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media_options.gni
diff --git a/media/media_options.gni b/media/media_options.gni
index 19067b1751fa5347609f466734f5b5e1b5b34966..5918237b13ee536438c4faffc55a7287ce5899ad 100644
--- a/media/media_options.gni
+++ b/media/media_options.gni
@@ -30,22 +30,6 @@ declare_args() {
# Override to dynamically link the cras (ChromeOS audio) library.
use_cras = false
- # Enables runtime selection of PulseAudio library.
- use_pulseaudio = false
-
- # Enables runtime selection of ALSA library for audio.
- use_alsa = false
-
- # Alsa should be used on non-Android, non-Mac POSIX systems, and Chromecast
- # builds for desktop Linux.
- if (is_posix && !is_headless && !is_android && !is_mac &&
- (!is_chromecast || is_cast_desktop_build)) {
- use_alsa = true
- if (!use_cras) {
- use_pulseaudio = true
- }
- }
-
# Use low-memory buffers on non-Android builds of Chromecast.
use_low_memory_buffer = is_chromecast && !is_android
@@ -71,3 +55,21 @@ declare_args() {
# TODO(GYP): This should be a platform define.
is_openbsd = false
}
+
+declare_args() {
+ # Enables runtime selection of PulseAudio library.
+ use_pulseaudio = false
+
+ # Enables runtime selection of ALSA library for audio.
+ use_alsa = false
+
+ # Alsa should be used on non-Android, non-Mac POSIX systems, and Chromecast
+ # builds for desktop Linux.
+ if (is_posix && !is_headless && !is_android && !is_mac &&
+ (!is_chromecast || is_cast_desktop_build)) {
+ use_alsa = true
+ if (!use_cras) {
+ use_pulseaudio = true
+ }
+ }
+}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698