diff options
| author | 2017-11-14 01:30:00 +0000 | |
|---|---|---|
| committer | 2017-11-14 01:30:00 +0000 | |
| commit | 455a1938ab7328d0f2577fe28f16c2a1bcc895f5 (patch) | |
| tree | 84ff58ee97fce751c7c0e9b9c6a97c3b409ede6d | |
| parent | f3c3e9a9468b3b16fc391c59be4c67d78c61a610 (diff) | |
| parent | 099f6321e10a5e99c93a7d98eb69bf4895c2edf3 (diff) | |
Merge changes from topic "enable-unknown-warning-option" am: 1dbd332c81
am: 099f6321e1
Change-Id: Ic3a42d3b27edb5111bfd86ee11d562aebe322ca3
| -rw-r--r-- | opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp | 2 | ||||
| -rw-r--r-- | opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp | 2 | ||||
| -rw-r--r-- | opengl/tools/glgen/stubs/gles11/common.cpp | 2 | ||||
| -rw-r--r-- | opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp b/opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp index bdbd85507e..f90e3ec590 100644 --- a/opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp +++ b/opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp @@ -20,7 +20,7 @@ #pragma GCC diagnostic ignored "-Wunused-function" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <android_runtime/android_view_Surface.h> #include <android_runtime/android_graphics_SurfaceTexture.h> diff --git a/opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp b/opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp index 3258ac49dc..12b96f40d7 100644 --- a/opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp +++ b/opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp @@ -20,7 +20,7 @@ #pragma GCC diagnostic ignored "-Wunused-function" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <android_runtime/android_view_Surface.h> #include <android_runtime/android_graphics_SurfaceTexture.h> diff --git a/opengl/tools/glgen/stubs/gles11/common.cpp b/opengl/tools/glgen/stubs/gles11/common.cpp index 7062c5751f..2163d7600d 100644 --- a/opengl/tools/glgen/stubs/gles11/common.cpp +++ b/opengl/tools/glgen/stubs/gles11/common.cpp @@ -1,5 +1,5 @@ #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/misc.h> #include <assert.h> diff --git a/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp b/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp index 0da80fbcba..29296ff6a9 100644 --- a/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp +++ b/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp @@ -20,7 +20,7 @@ #pragma GCC diagnostic ignored "-Wunused-function" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/misc.h> |