Bug 1008079 - Add cubeb_resampler.cpp to build files. r=glandium

media/libcubeb/src/moz.build

@@ -47,6 +47,7 @@ if CONFIG['OS_TARGET'] == 'WINNT':
 
 if CONFIG['OS_TARGET'] == 'Android':
     SOURCES += ['cubeb_opensl.c']
+    SOURCES += ['cubeb_resampler.cpp']
     SOURCES['cubeb_opensl.c'].flags += ['-Wno-declaration-after-statement']
     DEFINES['USE_OPENSL'] = True
     if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':

media/libcubeb/tests/Makefile.in

@@ -12,6 +12,11 @@ else
   # Otherwise, we can just grab all the compiled .o and compile against that,
   # linking the appriopriate libraries.
   LIBS = $(call EXPAND_LIBNAME_PATH,cubeb,$(DEPTH)/media/libcubeb/src)
+  # Don't link gkmedias for it introduces dependencies on Android.
+  ifeq ($(OS_TARGET),Android)
+    LIBS += $(call EXPAND_LIBNAME_PATH,speex,$(DEPTH)/media/libspeex_resampler/src)
+  endif
+
   ifeq ($(OS_TARGET),Darwin)
     LIBS += -framework AudioUnit -framework CoreAudio
   else

media/libspeex_resampler/src/moz.build

@@ -4,6 +4,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+LIBRARY_NAME = 'speex'
+
 EXPORTS.speex += [
     'speex_config_types.h',
     'speex_resampler.h',