diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-13 22:46:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-13 22:46:04 +0200 |
| commit | 1124fb525bf7b8341170d886b8de070e20323efd (patch) | |
| tree | ed5b0ee5976d7e1411c9ed3ac163b32383ba76e4 /media/libcubeb/src | |
| parent | a6de0846702b2eb21ce2f29ba42bf968fbd4fe2f (diff) | |
| download | UXP-1124fb525bf7b8341170d886b8de070e20323efd.tar UXP-1124fb525bf7b8341170d886b8de070e20323efd.tar.gz UXP-1124fb525bf7b8341170d886b8de070e20323efd.tar.lz UXP-1124fb525bf7b8341170d886b8de070e20323efd.tar.xz UXP-1124fb525bf7b8341170d886b8de070e20323efd.zip | |
Remove other gonk widget conditionals and unused files.
Tag #288.
Diffstat (limited to 'media/libcubeb/src')
| -rw-r--r-- | media/libcubeb/src/moz.build | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build index 781214620..2ca3a2f54 100644 --- a/media/libcubeb/src/moz.build +++ b/media/libcubeb/src/moz.build @@ -29,8 +29,6 @@ if CONFIG['MOZ_PULSEAUDIO']: 'cubeb_pulse.c', ] DEFINES['USE_PULSE'] = True - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - DEFINES['DISABLE_LIBPULSE_DLOPEN'] = True if CONFIG['MOZ_JACK']: SOURCES += [ @@ -73,24 +71,13 @@ if CONFIG['OS_TARGET'] == 'Android': SOURCES += ['cubeb_opensl.c'] SOURCES += ['cubeb_resampler.cpp'] DEFINES['USE_OPENSL'] = True - if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': - SOURCES += [ - 'cubeb_audiotrack.c', - ] - DEFINES['USE_AUDIOTRACK'] = True + SOURCES += [ + 'cubeb_audiotrack.c', + ] + DEFINES['USE_AUDIOTRACK'] = True FINAL_LIBRARY = 'gkmedias' -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - if CONFIG['ANDROID_VERSION'] >= '17': - LOCAL_INCLUDES += [ - '%' + '%s/frameworks/wilhelm/include' % CONFIG['ANDROID_SOURCE'], - ] - else: - LOCAL_INCLUDES += [ - '%' + '%s/system/media/wilhelm/include' % CONFIG['ANDROID_SOURCE'], - ] - CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] |