Bug 953394 - Remove debug code r=doublec
authorEdwin Flores <eflores@mozilla.com>
Wed, 22 Jan 2014 09:59:54 +1300
changeset 164517 92cb918918805f8943186ce64666ddc9c6cba5c4
parent 164516 156dd7431c8ecb39eb8cdaea9cfa7c20927073a3
child 164518 5becc07d9dac4a2902988a8855be12d76815b12d
child 164551 51d581fdf7832f891296ba5dce043aa8ebf3a55f
push id38726
push usereflores@mozilla.com
push dateTue, 21 Jan 2014 21:00:10 +0000
treeherdermozilla-inbound@92cb91891880 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdoublec
bugs953394
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 953394 - Remove debug code r=doublec
content/media/plugins/MediaPluginHost.cpp
--- a/content/media/plugins/MediaPluginHost.cpp
+++ b/content/media/plugins/MediaPluginHost.cpp
@@ -147,20 +147,17 @@ static const char* GetOmxLibraryName()
     ALOG("Android Hardware is: %s", NS_LossyConvertUTF16toASCII(hardware).get());
   }
 #endif
 
   if (!IsOmxSupported())
     return nullptr;
 
 #if defined(ANDROID) && !defined(MOZ_WIDGET_GONK)
-  /*
   if (version >= 19) {
-  */
-  if (version >= 16) {
     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.