Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8fbb001 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 233 into donut 

* changes:
  Add an Android-specific static OpenGL ES 1.1 Java API.
parents 1ebb2860 27f8002e

api/current.xml

+10420 −1

File changed.

File size exceeds preview limit.

View original file
View changed file

core/jni/Android.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,10 @@ LOCAL_SRC_FILES:= \ 
	CursorWindow.cpp \

	CursorWindow.cpp \

	com_google_android_gles_jni_EGLImpl.cpp \

	com_google_android_gles_jni_EGLImpl.cpp \

	com_google_android_gles_jni_GLImpl.cpp.arm \

	com_google_android_gles_jni_GLImpl.cpp.arm \

	android_opengl_GLES10.cpp \

	android_opengl_GLES10Ext.cpp \

	android_opengl_GLES11.cpp \

	android_opengl_GLES11Ext.cpp \

	android_database_CursorWindow.cpp \

	android_database_CursorWindow.cpp \

	android_database_SQLiteDebug.cpp \

	android_database_SQLiteDebug.cpp \

	android_database_SQLiteDatabase.cpp \

	android_database_SQLiteDatabase.cpp \

core/jni/AndroidRuntime.cpp

+8 −0
Original line number Original line Diff line number Diff line
@@ -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_EGLImpl(JNIEnv* env);

extern int register_com_google_android_gles_jni_GLImpl(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);

extern int register_android_hardware_Camera(JNIEnv *env);
@@ -1042,6 +1046,10 @@ static const RegJNIRec gRegJNI[] = { 
    REG_JNI(register_android_view_ViewRoot),

    REG_JNI(register_android_view_ViewRoot),

    REG_JNI(register_com_google_android_gles_jni_EGLImpl),

    REG_JNI(register_com_google_android_gles_jni_EGLImpl),

    REG_JNI(register_com_google_android_gles_jni_GLImpl),

    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_Bitmap),

    REG_JNI(register_android_graphics_BitmapFactory),

    REG_JNI(register_android_graphics_BitmapFactory),