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

Commit 096a6ac0 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 am: 9cd659c8

am: 7ec584b1

Change-Id: Id80fe1c03e327153a8ecb73cb9953f43b3ed8cfb
parents 57c50525 7ec584b1
Loading
Loading
Loading
Loading
+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>

+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>

+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>

+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>