summaryrefslogtreecommitdiffstats
path: root/opengl/tools
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-09-27 15:38:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-27 15:38:04 -0700
commitb7f3742feb0f419f9e2d7d43c6ba9dc64bb5d95c (patch)
tree1fe554f46fb6b612fbd464984a2937464da29e27 /opengl/tools
parent338acd6869532f2684cbd1e4f273eaffc6d4ef6d (diff)
parentd9be16f920f7c2581fda3ca495c1e6fc88857a6c (diff)
downloadframeworks_native-b7f3742feb0f419f9e2d7d43c6ba9dc64bb5d95c.zip
frameworks_native-b7f3742feb0f419f9e2d7d43c6ba9dc64bb5d95c.tar.gz
frameworks_native-b7f3742feb0f419f9e2d7d43c6ba9dc64bb5d95c.tar.bz2
am d9be16f9: Merge "Fix OpenGL stub exception handling."
* commit 'd9be16f920f7c2581fda3ca495c1e6fc88857a6c': Fix OpenGL stub exception handling.
Diffstat (limited to 'opengl/tools')
-rw-r--r--opengl/tools/glgen/src/JniCodeEmitter.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/opengl/tools/glgen/src/JniCodeEmitter.java b/opengl/tools/glgen/src/JniCodeEmitter.java
index d5e2d34..b1bd1fd 100644
--- a/opengl/tools/glgen/src/JniCodeEmitter.java
+++ b/opengl/tools/glgen/src/JniCodeEmitter.java
@@ -1073,6 +1073,7 @@ public class JniCodeEmitter {
String decl = type.getDeclaration();
needsExit = true;
out.println(indent + "if (!" + cname + ") {");
+ out.println(indent + indent + "_exception = 1;");
out.println(indent + indent +
"_exceptionType = \"java/lang/IllegalArgumentException\";");
out.println(indent + indent +