summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2017-07-18 20:16:08 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-18 20:16:08 +0000
commit9cd659c8dcd1f48b6d42f4463022ee6fac92e3eb (patch)
tree1160a8582d6447b21bfcaef8ee92732e9d437b4e
parentf8187f4e12abab363f88e0edcd21189f705148c0 (diff)
parent6ac4d2a42b33d043e22341a7b87a0393bb809f6d (diff)
Merge "Reference nativehelper/jni.h as jni.h" am: 28c9177f66
am: 6ac4d2a42b Change-Id: Id1fd8abd06cfb80ccae1304d2a3005b27ba95008
-rw-r--r--opengl/tests/gl2_jni/jni/gl_code.cpp2
-rw-r--r--opengl/tests/gl_jni/jni/gl_code.cpp2
-rw-r--r--opengl/tests/gl_perfapp/jni/gl_code.cpp2
-rw-r--r--opengl/tests/gldual/jni/gl_code.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/opengl/tests/gl2_jni/jni/gl_code.cpp b/opengl/tests/gl2_jni/jni/gl_code.cpp
index ed896a4a5c..c4180d4d9a 100644
--- a/opengl/tests/gl2_jni/jni/gl_code.cpp
+++ b/opengl/tests/gl2_jni/jni/gl_code.cpp
@@ -1,6 +1,6 @@
// OpenGL ES 2.0 code
-#include <nativehelper/jni.h>
+#include <jni.h>
#define LOG_TAG "GL2JNI gl_code.cpp"
#include <utils/Log.h>
diff --git a/opengl/tests/gl_jni/jni/gl_code.cpp b/opengl/tests/gl_jni/jni/gl_code.cpp
index cf86020a3d..48944e0a45 100644
--- a/opengl/tests/gl_jni/jni/gl_code.cpp
+++ b/opengl/tests/gl_jni/jni/gl_code.cpp
@@ -1,6 +1,6 @@
// OpenGL ES 1.0 code
-#include <nativehelper/jni.h>
+#include <jni.h>
#define LOG_TAG "GLJNI gl_code.cpp"
#include <utils/Log.h>
diff --git a/opengl/tests/gl_perfapp/jni/gl_code.cpp b/opengl/tests/gl_perfapp/jni/gl_code.cpp
index 378c8e88db..946ee07c3a 100644
--- a/opengl/tests/gl_perfapp/jni/gl_code.cpp
+++ b/opengl/tests/gl_perfapp/jni/gl_code.cpp
@@ -1,6 +1,6 @@
// OpenGL ES 2.0 code
-#include <nativehelper/jni.h>
+#include <jni.h>
#define LOG_TAG "GLPerf gl_code.cpp"
#include <utils/Log.h>
diff --git a/opengl/tests/gldual/jni/gl_code.cpp b/opengl/tests/gldual/jni/gl_code.cpp
index 22867ed6ba..3b114002f1 100644
--- a/opengl/tests/gldual/jni/gl_code.cpp
+++ b/opengl/tests/gldual/jni/gl_code.cpp
@@ -1,6 +1,6 @@
// OpenGL ES 2.0 code
-#include <nativehelper/jni.h>
+#include <jni.h>
#define LOG_TAG "GL2JNI gl_code.cpp"
#include <utils/Log.h>