Bug 1262335 - Part 3. Remove OMX loader for Android GB/HC. r?snorp draft
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Wed, 06 Apr 2016 17:30:45 +0900
changeset 347985 c6e382ddc9323ab9b1048fae45b7eb977a120c2d
parent 347984 2cc767bcb135e675f842272c8a7a97f0e326c6b6
child 347986 a364e8bccc8c8f873e3aa299eeb6a1c7de60d473
push id14719
push userm_kato@ga2.so-net.ne.jp
push dateWed, 06 Apr 2016 08:32:20 +0000
reviewerssnorp
bugs1262335
milestone48.0a1
Bug 1262335 - Part 3. Remove OMX loader for Android GB/HC. r?snorp MozReview-Commit-ID: CBWVeqimtq0
dom/media/android/AndroidMediaPluginHost.cpp
--- a/dom/media/android/AndroidMediaPluginHost.cpp
+++ b/dom/media/android/AndroidMediaPluginHost.cpp
@@ -169,37 +169,18 @@ static const char* GetOmxLibraryName()
 
   if (!IsOmxSupported())
     return nullptr;
 
 #if defined(ANDROID) && !defined(MOZ_WIDGET_GONK)
   if (version >= 17) {
     return "libomxpluginkk.so";
   }
-  else if (version == 13 || version == 12 || version == 11) {
-    return "libomxpluginhc.so";
-  }
-  else if (version == 10 && release_version >= NS_LITERAL_STRING("2.3.6")) {
-    // Gingerbread versions from 2.3.6 and above have a different DataSource
-    // layout to those on 2.3.5 and below.
-    return "libomxplugingb.so";
-  }
-  else if (version == 10 && release_version >= NS_LITERAL_STRING("2.3.4") &&
-           device.Find("HTC") == 0) {
-    // HTC devices running Gingerbread 2.3.4+ (HTC Desire HD, HTC Evo Design, etc) seem to
-    // use a newer version of Gingerbread libstagefright than other 2.3.4 devices.
-    return "libomxplugingb.so";
-  }
-  else if (version == 9 || (version == 10 && release_version <= NS_LITERAL_STRING("2.3.5"))) {
-    // Gingerbread versions from 2.3.5 and below have a different DataSource
-    // than 2.3.6 and above.
-    return "libomxplugingb235.so";
-  }
-  else if (version < 9) {
-    // Below Gingerbread not supported
+  else if (version < 14) {
+    // Below Honeycomb not supported
     return nullptr;
   }
 
   // Ice Cream Sandwich and Jellybean
   return "libomxplugin.so";
 
 #elif defined(ANDROID) && defined(MOZ_WIDGET_GONK)
   return "libomxplugin.so";