summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-07-18 02:47:33 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-07-18 02:47:33 +0000
commit28c9177f665f9f5f7e6e809bd8e3d674d10d26fa (patch)
tree9414deb294cccf3f75e238fa0853e6bb0c187265
parent8a094116b1a2b5478945116c1c5c07bba1810aa5 (diff)
parent23bfa224ebeb60bfa39a6f3cc55c87bcd651b36a (diff)
downloadnative-28c9177f665f9f5f7e6e809bd8e3d674d10d26fa.tar.gz
Merge "Reference nativehelper/jni.h as jni.h"
-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>