diff options
| author | Jesse Hall <jessehall@google.com> | 2013-05-13 18:53:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-05-13 18:53:10 +0000 |
| commit | f0dcff89acb998179757ca66b5c6a2c585a980e9 (patch) | |
| tree | f87592e9ee9a31a3467153aabcfd2f1970bfca75 /opengl | |
| parent | a3d3e137f473a965fefced9670e3b0c6b5f7f791 (diff) | |
| parent | 0f036d43b00d602a073b413d0fc746c82ca1db7a (diff) | |
| download | frameworks_native-f0dcff89acb998179757ca66b5c6a2c585a980e9.zip frameworks_native-f0dcff89acb998179757ca66b5c6a2c585a980e9.tar.gz frameworks_native-f0dcff89acb998179757ca66b5c6a2c585a980e9.tar.bz2 | |
Merge "gl_code.cpp: Remove a DOS style newline"
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/tests/gl2_jni/jni/gl_code.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/tests/gl2_jni/jni/gl_code.cpp b/opengl/tests/gl2_jni/jni/gl_code.cpp index fa6bd93..ed896a4 100644 --- a/opengl/tests/gl2_jni/jni/gl_code.cpp +++ b/opengl/tests/gl2_jni/jni/gl_code.cpp @@ -153,7 +153,7 @@ extern "C" { JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_step(JNIEnv * env, jobject obj); }; -JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_init(JNIEnv * env, jobject obj, jint width, jint height)
+JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_init(JNIEnv * env, jobject obj, jint width, jint height) { setupGraphics(width, height); } |