Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ac4d2a4 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Reference nativehelper/jni.h as jni.h" 

am: 28c9177f

Change-Id: If460edb57fbd4678cfe932eb76b0931024f17f80
parents bb7e1b68 28c9177f

opengl/tests/gl2_jni/jni/gl_code.cpp

+1 −1
Original line number Diff line number Diff line 
// OpenGL ES 2.0 code



#include <nativehelper/jni.h>

#include <jni.h>

#define LOG_TAG "GL2JNI gl_code.cpp"

#include <utils/Log.h>

opengl/tests/gl_jni/jni/gl_code.cpp

+1 −1
Original line number Diff line number Diff line 
// OpenGL ES 1.0 code



#include <nativehelper/jni.h>

#include <jni.h>

#define LOG_TAG "GLJNI gl_code.cpp"

#include <utils/Log.h>

opengl/tests/gl_perfapp/jni/gl_code.cpp

+1 −1
Original line number Diff line number Diff line 
// OpenGL ES 2.0 code



#include <nativehelper/jni.h>

#include <jni.h>

#define LOG_TAG "GLPerf gl_code.cpp"

#include <utils/Log.h>

opengl/tests/gldual/jni/gl_code.cpp

+1 −1
Original line number Diff line number Diff line 
// OpenGL ES 2.0 code



#include <nativehelper/jni.h>

#include <jni.h>

#define LOG_TAG "GL2JNI gl_code.cpp"

#include <utils/Log.h>