From e16bcd08aae85a7d9c2de5a4b1c733280cb81112 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Sun, 13 May 2018 00:08:52 +0200
Subject: Remove MOZ_WIDGET_GONK [2/2]

Tag #288
---
 dom/media/android/AndroidMediaPluginHost.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'dom/media/android/AndroidMediaPluginHost.cpp')

diff --git a/dom/media/android/AndroidMediaPluginHost.cpp b/dom/media/android/AndroidMediaPluginHost.cpp
index d3dce2b93..cc3adbbd3 100644
--- a/dom/media/android/AndroidMediaPluginHost.cpp
+++ b/dom/media/android/AndroidMediaPluginHost.cpp
@@ -22,7 +22,7 @@
 
 #include "nsIPropertyBag2.h"
 
-#if defined(ANDROID) || defined(MOZ_WIDGET_GONK)
+#if defined(ANDROID)
 #include "android/log.h"
 #define ALOG(args...)  __android_log_print(ANDROID_LOG_INFO, "AndroidMediaPluginHost" , ## args)
 #else
@@ -134,7 +134,7 @@ static bool IsOmxSupported()
 // nullptr is returned if Omx decoding is not supported on the device,
 static const char* GetOmxLibraryName()
 {
-#if defined(ANDROID) && !defined(MOZ_WIDGET_GONK)
+#if defined(ANDROID)
   nsCOMPtr<nsIPropertyBag2> infoService = do_GetService("@mozilla.org/system-info;1");
   NS_ASSERTION(infoService, "Could not find a system info service");
 
@@ -172,7 +172,7 @@ static const char* GetOmxLibraryName()
   if (!IsOmxSupported())
     return nullptr;
 
-#if defined(ANDROID) && !defined(MOZ_WIDGET_GONK)
+#if defined(ANDROID)
   if (version >= 17) {
     return "libomxpluginkk.so";
   }
@@ -180,8 +180,6 @@ static const char* GetOmxLibraryName()
   // Ice Cream Sandwich and Jellybean
   return "libomxplugin.so";
 
-#elif defined(ANDROID) && defined(MOZ_WIDGET_GONK)
-  return "libomxplugin.so";
 #else
   return nullptr;
 #endif
-- 
cgit v1.2.3