summaryrefslogtreecommitdiffstats
path: root/core/jni/AndroidRuntime.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-04-17 13:11:48 -0700
committerMathias Agopian <mathias@google.com>2009-04-17 13:11:48 -0700
commit13b3b5c9b2594fe2a42e479ae4f3f733fce911dc (patch)
tree06fe3332007b70fd7555f1e7f3c51de188b66717 /core/jni/AndroidRuntime.cpp
parent69d62097e8195c947de7e4cdc4a491181aa56e61 (diff)
parentcec478a162f027ea4727ccbe10c1297acd4342f0 (diff)
downloadframeworks_base-13b3b5c9b2594fe2a42e479ae4f3f733fce911dc.zip
frameworks_base-13b3b5c9b2594fe2a42e479ae4f3f733fce911dc.tar.gz
frameworks_base-13b3b5c9b2594fe2a42e479ae4f3f733fce911dc.tar.bz2
Merge commit 'goog/master' into merge_master
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
-rw-r--r--core/jni/AndroidRuntime.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 5872c9e..1c45b35 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -66,6 +66,10 @@ extern int register_android_graphics_Typeface(JNIEnv* env);
extern int register_com_google_android_gles_jni_EGLImpl(JNIEnv* env);
extern int register_com_google_android_gles_jni_GLImpl(JNIEnv* env);
+extern int register_android_opengl_jni_GLES10(JNIEnv* env);
+extern int register_android_opengl_jni_GLES10Ext(JNIEnv* env);
+extern int register_android_opengl_jni_GLES11(JNIEnv* env);
+extern int register_android_opengl_jni_GLES11Ext(JNIEnv* env);
extern int register_android_hardware_Camera(JNIEnv *env);
@@ -1086,6 +1090,10 @@ static const RegJNIRec gRegJNI[] = {
REG_JNI(register_android_view_ViewRoot),
REG_JNI(register_com_google_android_gles_jni_EGLImpl),
REG_JNI(register_com_google_android_gles_jni_GLImpl),
+ REG_JNI(register_android_opengl_jni_GLES10),
+ REG_JNI(register_android_opengl_jni_GLES10Ext),
+ REG_JNI(register_android_opengl_jni_GLES11),
+ REG_JNI(register_android_opengl_jni_GLES11Ext),
REG_JNI(register_android_graphics_Bitmap),
REG_JNI(register_android_graphics_BitmapFactory),