diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-13 00:08:52 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-13 00:08:52 +0200 |
| commit | e42946797240f4dfb3d98b610d0d53665675225c (patch) | |
| tree | 220026724ceb8fbcf18bf627fde022c2d8df0e91 /dom/media/ogg | |
| parent | 6971bbb2277a260e398b8811be1970f8b3853357 (diff) | |
| download | uxp-e42946797240f4dfb3d98b610d0d53665675225c.tar.gz | |
Remove MOZ_WIDGET_GONK [2/2]
Tag mcp-graveyard/UXP#288
Diffstat (limited to 'dom/media/ogg')
| -rw-r--r-- | dom/media/ogg/OggCodecState.cpp | 12 | ||||
| -rw-r--r-- | dom/media/ogg/OggWriter.cpp | 5 |
2 files changed, 0 insertions, 17 deletions
diff --git a/dom/media/ogg/OggCodecState.cpp b/dom/media/ogg/OggCodecState.cpp index 6830639e89..e7e1ca4a3a 100644 --- a/dom/media/ogg/OggCodecState.cpp +++ b/dom/media/ogg/OggCodecState.cpp @@ -18,18 +18,6 @@ #include <opus/opus.h> #include "opus/opus_multistream.h" -// On Android JellyBean, the hardware.h header redefines version_major and -// version_minor, which breaks our build. See: -// https://bugzilla.mozilla.org/show_bug.cgi?id=912702#c6 -#ifdef MOZ_WIDGET_GONK -#ifdef version_major -#undef version_major -#endif -#ifdef version_minor -#undef version_minor -#endif -#endif - namespace mozilla { extern LazyLogModule gMediaDecoderLog; diff --git a/dom/media/ogg/OggWriter.cpp b/dom/media/ogg/OggWriter.cpp index bb0dca67b1..e1aa93eafc 100644 --- a/dom/media/ogg/OggWriter.cpp +++ b/dom/media/ogg/OggWriter.cpp @@ -7,12 +7,7 @@ #include "GeckoProfiler.h" #undef LOG -#ifdef MOZ_WIDGET_GONK -#include <android/log.h> -#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "MediaEncoder", ## args); -#else #define LOG(args, ...) -#endif namespace mozilla { |