4 files changed, 3 insertions, 41 deletions
diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp
index 6b16d698d3..54b09e6447 100644
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -1564,28 +1564,6 @@ private:
   RefPtr<MediaManager> mManager; // get ref to this when creating the runnable
 };
 
-#if defined(ANDROID)
-class GetUserMediaRunnableWrapper : public Runnable
-{
-public:
-  // This object must take ownership of task
-  GetUserMediaRunnableWrapper(GetUserMediaTask* task) :
-    mTask(task) {
-  }
-
-  ~GetUserMediaRunnableWrapper() {
-  }
-
-  NS_IMETHOD Run() override {
-    mTask->Run();
-    return NS_OK;
-  }
-
-private:
-  nsAutoPtr<GetUserMediaTask> mTask;
-};
-#endif
-
 /**
  * EnumerateRawDevices - Enumerate a list of audio & video devices that
  * satisfy passed-in constraints. List contains raw id's.
@@ -2577,8 +2555,7 @@ MediaEngine*
 MediaManager::GetBackend(uint64_t aWindowId)
 {
   MOZ_ASSERT(MediaManager::IsInMediaThread());
-  // Plugin backends as appropriate. The default engine also currently
-  // includes picture support for Android.
+  // Plugin backends as appropriate.
   // This IS called off main-thread.
   if (!mBackend) {
     MOZ_RELEASE_ASSERT(!sInShutdown);  // we should never create a new backend in shutdown
diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp
index 1b9e4f6749..db5fa8fa39 100644
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -50,15 +50,8 @@ LazyLogModule gMediaStreamGraphLog("MediaStreamGraph");
 
 // #define ENABLE_LIFECYCLE_LOG
 
-// We don't use NSPR log here because we want this interleaved with adb logcat
-// on Android/B2G
 #ifdef ENABLE_LIFECYCLE_LOG
-#  ifdef ANDROID
-#    include "android/log.h"
-#    define LIFECYCLE_LOG(...)  __android_log_print(ANDROID_LOG_INFO, "Gecko - MSG", ## __VA_ARGS__); printf(__VA_ARGS__);printf("\n");
-#  else
-#    define LIFECYCLE_LOG(...) printf(__VA_ARGS__);printf("\n");
-#  endif
+#  define LIFECYCLE_LOG(...) printf(__VA_ARGS__);printf("\n");
 #else
 #  define LIFECYCLE_LOG(...)
 #endif
diff --git a/dom/media/moz.build b/dom/media/moz.build
index 4c22fdb64b..cbe91c255f 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -296,17 +296,11 @@ if CONFIG['OS_TARGET'] == 'WINNT':
 else:
     DEFINES['WEBRTC_POSIX'] = True
 
-if CONFIG['ANDROID_VERSION'] > '15':
-    DEFINES['MOZ_OMX_WEBM_DECODER'] = True
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 # Suppress some GCC warnings being treated as errors:
-#  - about attributes on forward declarations for types that are already
-#    defined, which complains about an important MOZ_EXPORT for android::AString
 if CONFIG['GNU_CC']:
     CXXFLAGS += [
-        '-Wno-error=attributes',
         '-Wno-error=shadow',
     ]
 
diff --git a/dom/media/systemservices/LoadMonitor.cpp b/dom/media/systemservices/LoadMonitor.cpp
index ef8d1a0cc7..9ef01999c0 100644
--- a/dom/media/systemservices/LoadMonitor.cpp
+++ b/dom/media/systemservices/LoadMonitor.cpp
@@ -346,8 +346,6 @@ void RTCLoadInfo::UpdateCpuLoad(uint64_t ticks_per_interval,
        > (ticks_per_interval * 10))
       || current_total_times < loadStat->mPrevTotalTimes
       || current_cpu_times < loadStat->mPrevCpuTimes) {
-    // Bug at least on the Nexus 4 and Galaxy S4
-    // https://code.google.com/p/android/issues/detail?id=41630
     // We do need to update our previous times, or we can get stuck
     // when there is a blip upwards and then we get a bunch of consecutive
     // lower times. Just skip the load calculation.
@@ -374,7 +372,7 @@ void RTCLoadInfo::UpdateCpuLoad(uint64_t ticks_per_interval,
 
 nsresult RTCLoadInfo::UpdateSystemLoad()
 {
-#if defined(LINUX) || defined(ANDROID)
+#if defined(LINUX)
   nsCOMPtr<nsIFile> procStatFile = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID);
   procStatFile->InitWithPath(NS_LITERAL_STRING("/proc/stat"));