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

Commit 9cd659c8 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 

am: 6ac4d2a4

Change-Id: Id1fd8abd06cfb80ccae1304d2a3005b27ba95008
parents f8187f4e 6ac4d2a4

opengl/tests/gl2_jni/jni/gl_code.cpp

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

// OpenGL ES 2.0 code





#include <nativehelper/jni.h>

#include <jni.h>

#define LOG_TAG "GL2JNI gl_code.cpp"

#define LOG_TAG "GL2JNI gl_code.cpp"

#include <utils/Log.h>

#include <utils/Log.h>

opengl/tests/gl_jni/jni/gl_code.cpp

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

// OpenGL ES 1.0 code





#include <nativehelper/jni.h>

#include <jni.h>

#define LOG_TAG "GLJNI gl_code.cpp"

#define LOG_TAG "GLJNI gl_code.cpp"

#include <utils/Log.h>

#include <utils/Log.h>

opengl/tests/gl_perfapp/jni/gl_code.cpp

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

// OpenGL ES 2.0 code





#include <nativehelper/jni.h>

#include <jni.h>

#define LOG_TAG "GLPerf gl_code.cpp"

#define LOG_TAG "GLPerf gl_code.cpp"

#include <utils/Log.h>

#include <utils/Log.h>

opengl/tests/gldual/jni/gl_code.cpp

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

// OpenGL ES 2.0 code





#include <nativehelper/jni.h>

#include <jni.h>

#define LOG_TAG "GL2JNI gl_code.cpp"

#define LOG_TAG "GL2JNI gl_code.cpp"

#include <utils/Log.h>

#include <utils/Log.h>