diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-14 10:50:01 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-14 10:50:01 +0200 |
| commit | e9dd029f5d00590e1a53e63b0ab805110a10b54c (patch) | |
| tree | 1126ca5dda925a62be3dc12c99c90e953d08afcf /media/libcubeb/src | |
| parent | 9d6a7ae25d7f5da855a8f8df884de483b4e2a538 (diff) | |
| parent | 36b8fd734f590eb726ca2e50f8d1ff9cc968b8e1 (diff) | |
| download | UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.gz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.lz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.xz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'media/libcubeb/src')
| -rw-r--r-- | media/libcubeb/src/cubeb_opensl.c | 5 | ||||
| -rw-r--r-- | media/libcubeb/src/moz.build | 21 |
2 files changed, 4 insertions, 22 deletions
diff --git a/media/libcubeb/src/cubeb_opensl.c b/media/libcubeb/src/cubeb_opensl.c index d44a56bd7..dd5416228 100644 --- a/media/libcubeb/src/cubeb_opensl.c +++ b/media/libcubeb/src/cubeb_opensl.c @@ -187,10 +187,6 @@ static void opensl_destroy(cubeb * ctx); #if defined(__ANDROID__) -// The bionic header file on B2G contains the required -// declarations on all releases. -#ifndef MOZ_WIDGET_GONK - #if (__ANDROID_API__ >= ANDROID_VERSION_LOLLIPOP) typedef int (system_property_get)(const char*, char*); @@ -212,7 +208,6 @@ __system_property_get(const char* name, char* value) return ret; } #endif -#endif static int get_android_version(void) 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'] |