Bug 1407487 - P3: Exclude Android when enabling cubeb-remoting. r?kamidphish draft
authorMatthew Gregan <kinetik@flim.org>
Wed, 18 Oct 2017 17:16:06 +1300
changeset 682118 26d9628b14087ca9703f7e2b5a783fd8a101cdf8
parent 682117 4ccf4341804470cbcb8dc1ddf3eeb905aae12bcd
child 682119 76a02a0244d055679ef641cbcb28c8d7527a4cd7
child 682128 d8acc5c42dc47683ce77c26442a127e4d7781fa9
push id85003
push userbmo:kinetik@flim.org
push dateWed, 18 Oct 2017 04:18:34 +0000
reviewerskamidphish
bugs1407487
milestone58.0a1
Bug 1407487 - P3: Exclude Android when enabling cubeb-remoting. r?kamidphish MozReview-Commit-ID: 1bi07WmNqgb
dom/media/CubebUtils.cpp
toolkit/library/rust/gkrust-features.mozbuild
--- a/dom/media/CubebUtils.cpp
+++ b/dom/media/CubebUtils.cpp
@@ -43,17 +43,17 @@
 #define MASK_3F1_LFE    (MASK_3F1 | (1 << AudioConfig::CHANNEL_LFE))
 #define MASK_2F2        (MASK_STEREO | (1 << AudioConfig::CHANNEL_LS) | (1 << AudioConfig::CHANNEL_RS))
 #define MASK_2F2_LFE    (MASK_2F2 | (1 << AudioConfig::CHANNEL_LFE))
 #define MASK_3F2        (MASK_3F | (1 << AudioConfig::CHANNEL_LS) | (1 << AudioConfig::CHANNEL_RS))
 #define MASK_3F2_LFE    (MASK_3F2 | (1 << AudioConfig::CHANNEL_LFE))
 #define MASK_3F3R_LFE   (MASK_3F2_LFE | (1 << AudioConfig::CHANNEL_RCENTER))
 #define MASK_3F4_LFE    (MASK_3F2_LFE | (1 << AudioConfig::CHANNEL_RLS) | (1 << AudioConfig::CHANNEL_RRS))
 
-#ifdef XP_LINUX
+#if defined(XP_LINUX) && !defined(MOZ_WIDGET_ANDROID)
 #define MOZ_CUBEB_REMOTING
 #endif
 
 extern "C" {
 // These functions are provided by audioipc-server crate
 extern void* audioipc_server_start();
 extern void audioipc_server_stop(void*);
 // These functions are provided by audioipc-client crate
--- a/toolkit/library/rust/gkrust-features.mozbuild
+++ b/toolkit/library/rust/gkrust-features.mozbuild
@@ -19,13 +19,13 @@ if CONFIG['MOZ_BUILD_WEBRENDER']:
 
 if CONFIG['MOZ_PULSEAUDIO']:
     gkrust_features += ['cubeb_pulse_rust']
 
 if CONFIG['MOZ_RUST_SIMD']:
     gkrust_features += ['simd-accel']
 
 # This feature is only supported on Linux and this check needs to
-# match XP_LINUX.
-if CONFIG['OS_ARCH'] == 'Linux':
+# match MOZ_CUBEB_REMOTING in CubebUtils.cpp.
+if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android':
     gkrust_features += ['cubeb-remoting']
 
 gkrust_features += ['no-static-ideograph-encoder-tables']