summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Russell Brenner <russellbrenner@google.com> 2011-03-31 18:55:26 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-31 18:55:26 -0700
commit64802ca780563e2bd715a300e0bb81eec643baf0 (patch)
tree61462a8c74f56deeab509fcb4ea441a35dc18044
parent7b445dd7c0814a39eaf912fa1a871f00d5190550 (diff)
parentc6b22e2727bd3730edd5ad72831a9bb4670d00f3 (diff)
am c6b22e27: Updated JBQ\'s original SurfaceTexture stubs to make webkit MR1 buildable
* commit 'c6b22e2727bd3730edd5ad72831a9bb4670d00f3': Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
-rw-r--r--include/gui/SurfaceTexture.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h
index 54ce78994af6..255afdd3cdca 100644
--- a/include/gui/SurfaceTexture.h
+++ b/include/gui/SurfaceTexture.h
@@ -30,6 +30,12 @@ struct SurfaceTexture {
void setFrameAvailableListener(const sp<FrameAvailableListener>&) {}
};
+static sp<SurfaceTexture> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz)
+{
+ sp<SurfaceTexture> s;
+ return s;
+}
+
}
#endif