Bug 1407487 - P3: Exclude Android when enabling cubeb-remoting. r?kamidphish
MozReview-Commit-ID: 1bi07WmNqgb
--- 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']