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

Commit 69aa9d63 authored by Orion Hodson's avatar Orion Hodson Committed by Android (Google) Code Review
Browse files

Merge changes from topic "oth/jni/dead-statics" 

* changes:
  Remove unused static variables
  Remove unnecessary field lookups in getPointer
parents 869f5c42 47546849

core/jni/android_opengl_EGL14.cpp

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ 


#include <ui/ANativeObjectBase.h>



static int initialized = 0;



static jclass egldisplayClass;

static jclass eglcontextClass;

static jclass eglsurfaceClass;

core/jni/android_opengl_EGL15.cpp

+0 −4
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 


#include <ui/ANativeObjectBase.h>



static int initialized = 0;



// classes from EGL 1.4

static jclass egldisplayClass;

static jclass eglsurfaceClass;
@@ -171,8 +169,6 @@ getPointer(JNIEnv *_env, jobject buffer, jarray *array, jint *remaining, jint *o 
        *array = NULL;

        return reinterpret_cast<void*>(pointer);

    }

    eglimageGetHandleID = _env->GetMethodID(eglimageClass, "getNativeHandle", "()J");

    eglsyncGetHandleID = _env->GetMethodID(eglsyncClass, "getNativeHandle", "()J");



    *array = (jarray) _env->CallStaticObjectMethod(nioAccessClass,

            getBaseArrayID, buffer);

core/jni/android_opengl_EGLExt.cpp

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 


#include <ui/ANativeObjectBase.h>



static int initialized = 0;



static jclass egldisplayClass;

static jclass eglcontextClass;

static jclass eglsurfaceClass;

core/jni/android_opengl_GLES10.cpp

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 
#include <utils/misc.h>

#include <assert.h>



static int initialized = 0;



static jclass nioAccessClass;

static jclass bufferClass;

static jmethodID getBasePointerID;

core/jni/android_opengl_GLES10Ext.cpp

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 
#include <utils/misc.h>

#include <assert.h>



static int initialized = 0;



static jclass nioAccessClass;

static jclass bufferClass;

static jmethodID getBasePointerID;