Bug 1086693 - Part 6: Use generated bindings for AndroidMediaCodec and AndroidSurfaceTexture r=blassey,gcp

widget/android/AndroidBridge.cpp

@@ -41,7 +41,9 @@
 #include "nsContentUtils.h"
 #include "nsIScriptError.h"
 #include "nsIHttpChannel.h"
-#include "GeneratedSDKWrappers.h"
+
+#include "MediaCodec.h"
+#include "SurfaceTexture.h"
 
 using namespace mozilla;
 using namespace mozilla::widget::android;
@@ -222,8 +224,11 @@ AndroidBridge::Init(JNIEnv *jEnv)
     InitAndroidJavaWrappers(jEnv);
 
     if (mAPIVersion >= 16 /* Jelly Bean */) {
-        // We only use this for MediaCodec right now
-        InitSDKStubs(jEnv);
+        sdk::InitMediaCodecStubs(jEnv);
+    }
+
+    if (mAPIVersion >= 14 /* ICS */) {
+        sdk::InitSurfaceTextureStubs(jEnv);
     }
 
     // jEnv should NOT be cached here by anything -- the jEnv here