From 1960d6e08a949ceed50e6a18240d40a7ecee879c Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 3 Nov 2019 14:14:26 -0500 Subject: Revert "Issue #1267 - Part 1: Update libcubeb to a1200c34." This reverts commit d162ecbaffe845c9707da5d2f6cab11f343ef00e. --- media/libcubeb/src/moz.build | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'media/libcubeb/src/moz.build') diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build index 4b36b80fb..772aa6d39 100644 --- a/media/libcubeb/src/moz.build +++ b/media/libcubeb/src/moz.build @@ -10,11 +10,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']: @@ -80,7 +76,6 @@ if CONFIG['OS_TARGET'] == 'WINNT': if CONFIG['OS_TARGET'] == 'Android': SOURCES += ['cubeb_opensl.c'] SOURCES += ['cubeb_resampler.cpp'] - SOURCES += ['cubeb-jni.cpp'] DEFINES['USE_OPENSL'] = True SOURCES += [ 'cubeb_audiotrack.c', @@ -90,7 +85,6 @@ if CONFIG['OS_TARGET'] == 'Android': 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. -- cgit v1.2.3