diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-11-03 14:35:17 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-11-03 14:35:17 -0500 |
| commit | a57983a2176afb4bab3c22efa6a24d39f3c11163 (patch) | |
| tree | 56dbcb66e07d997d817e40c1fd8005ee75142e8b /media/libcubeb/src/moz.build | |
| parent | 6513e41cb75e64384f35470d59ad6a4f88092e82 (diff) | |
| parent | 1960d6e08a949ceed50e6a18240d40a7ecee879c (diff) | |
| download | UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar.gz UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar.lz UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar.xz UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.zip | |
Merge branch 'master' into mailnews-work
Diffstat (limited to 'media/libcubeb/src/moz.build')
| -rw-r--r-- | media/libcubeb/src/moz.build | 8 |
1 files changed, 1 insertions, 7 deletions
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. |