Backed out changeset 320d429c6102 (bug 1846706) for bustages on Android

dom/media/CubebUtils.cpp

@@ -57,8 +57,7 @@
 #define PREF_AUDIOIPC_STACK_SIZE "media.audioipc.stack_size"
 #define PREF_AUDIOIPC_SHM_AREA_SIZE "media.audioipc.shm_area_size"
 
-#if defined(XP_LINUX) ||                                     \
-    defined(MOZ_ANDROID_CONTENT_SERVICE_ISOLATED_PROCESS) || \
+#if (defined(XP_LINUX) && !defined(MOZ_WIDGET_ANDROID)) || \
     defined(XP_MACOSX) || defined(XP_WIN)
 #  define MOZ_CUBEB_REMOTING
 #endif
@@ -651,7 +650,7 @@ void InitLibrary() {
 #endif
 #ifdef MOZ_CUBEB_REMOTING
   if (sCubebSandbox && XRE_IsContentProcess()) {
-#  if defined(XP_LINUX) && !defined(MOZ_WIDGET_ANDROID)
+#  ifdef XP_LINUX
     if (atp_set_real_time_limit(0, 48000)) {
       NS_WARNING("could not set real-time limit in CubebUtils::InitLibrary");
     }
@@ -839,20 +838,12 @@ bool EstimatedRoundTripLatencyDefaultDevices(double* aMean, double* aStdDev) {
 
 #ifdef MOZ_WIDGET_ANDROID
 int32_t AndroidGetAudioOutputSampleRate() {
-#  if defined(MOZ_ANDROID_CONTENT_SERVICE_ISOLATED_PROCESS)
-  return 44100;  // TODO: Remote value; will be handled in following patch.
-#  else
   int32_t sample_rate = java::GeckoAppShell::GetAudioOutputSampleRate();
   return sample_rate;
-#  endif
 }
 int32_t AndroidGetAudioOutputFramesPerBuffer() {
-#  if defined(MOZ_ANDROID_CONTENT_SERVICE_ISOLATED_PROCESS)
-  return 512;  // TODO: Remote value; will be handled in following patch.
-#  else
   int32_t frames = java::GeckoAppShell::GetAudioOutputFramesPerBuffer();
   return frames;
-#  endif
 }
 #endif
 

modules/libpref/init/StaticPrefList.yaml

@@ -9487,7 +9487,7 @@
 - name: media.cubeb.sandbox
   type: bool
   mirror: always
-#if defined(XP_LINUX) && !defined(MOZ_WIDGET_ANDROID) || defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_ANDROID_CONTENT_SERVICE_ISOLATED_PROCESS)
+#if defined(XP_LINUX) && !defined(MOZ_WIDGET_ANDROID) || defined(XP_WIN) || defined(XP_MACOSX)
   value: true
 #else
   value: false

toolkit/library/rust/gkrust-features.mozbuild

@@ -29,7 +29,7 @@ if CONFIG['MOZ_RUST_SIMD']:
 
 # This feature is not yet supported on all platforms, and this check needs to
 # match MOZ_CUBEB_REMOTING in CubebUtils.cpp.
-if CONFIG['OS_ARCH'] == 'Linux' or CONFIG['OS_ARCH'] == 'Darwin' or CONFIG['OS_ARCH'] == 'WINNT':
+if (CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android') or CONFIG['OS_ARCH'] == 'Darwin' or CONFIG['OS_ARCH'] == 'WINNT':
     gkrust_features += ['cubeb-remoting']
 
 if CONFIG['MOZ_MEMORY']: