1 files changed, 22 insertions, 13 deletions
diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build
index 50fffb6ff6..c21cc873db 100644
--- a/media/libcubeb/src/moz.build
+++ b/media/libcubeb/src/moz.build
@@ -9,11 +9,7 @@ Library('cubeb')
 
 SOURCES += [
     'cubeb.c',
-    'cubeb_log.cpp',
-    'cubeb_mixer.cpp',
-    'cubeb_panner.cpp',
-    'cubeb_strings.c',
-    'cubeb_utils.cpp'
+    'cubeb_panner.cpp'
 ]
 
 if CONFIG['MOZ_ALSA']:
@@ -42,11 +38,11 @@ if CONFIG['MOZ_JACK']:
     ]
     DEFINES['USE_JACK'] = True
 
-if CONFIG['OS_ARCH'] in ('DragonFly', 'FreeBSD'):
+if CONFIG['MOZ_SNDIO']:
     SOURCES += [
-        'cubeb_oss.c',
+        'cubeb_sndio.c',
     ]
-    DEFINES['USE_OSS'] = True
+    DEFINES['USE_SNDIO'] = True
 
 if CONFIG['OS_ARCH'] == 'SunOS':
     SOURCES += [
@@ -54,26 +50,39 @@ if CONFIG['OS_ARCH'] == 'SunOS':
     ]
     DEFINES['USE_SUN'] = True
 
+if CONFIG['OS_TARGET'] == 'Darwin':
+    SOURCES += [
+        'cubeb_audiounit.cpp',
+        'cubeb_resampler.cpp'
+    ]
+    DEFINES['USE_AUDIOUNIT'] = True
+
 if CONFIG['OS_TARGET'] == 'WINNT':
     SOURCES += [
         'cubeb_resampler.cpp',
         'cubeb_wasapi.cpp',
+        'cubeb_winmm.c',
     ]
-    DEFINES['UNICODE'] = True
+    DEFINES['USE_WINMM'] = True
     DEFINES['USE_WASAPI'] = True
-    OS_LIBS += [
-      "avrt",
-    ]
     if CONFIG['_MSC_VER']:
         CXXFLAGS += ['-wd4005'] # C4005: '_USE_MATH_DEFINES' : macro redefinition
 
+if CONFIG['OS_TARGET'] == 'Android':
+    SOURCES += ['cubeb_opensl.c']
+    SOURCES += ['cubeb_resampler.cpp']
+    DEFINES['USE_OPENSL'] = True
+    SOURCES += [
+        'cubeb_audiotrack.c',
+    ]
+    DEFINES['USE_AUDIOTRACK'] = True
+
 if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     NO_VISIBILITY_FLAGS = True
 
 FINAL_LIBRARY = 'gkmedias'
 
 CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
-CFLAGS += CONFIG['MOZ_JACK_CFLAGS']
 CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']
 
 # We allow warnings for third-party code that can be updated from upstream.