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

Commit abea8fa2 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Add missing ifdefs"

parents 18bfd887 496b8770

core/jni/android_view_RenderNodeAnimator.cpp

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ static struct { 
    jmethodID callOnFinished;

} gRenderNodeAnimatorClassInfo;



#ifdef USE_OPENGL_RENDERER



static JNIEnv* getEnv(JavaVM* vm) {

    JNIEnv* env;

    if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
@@ -93,6 +95,8 @@ static void unref(JNIEnv* env, jobject clazz, jlong objPtr) { 
    obj->decStrong(0);

}



#endif



// ----------------------------------------------------------------------------

// JNI Glue

// ----------------------------------------------------------------------------
@@ -100,9 +104,11 @@ static void unref(JNIEnv* env, jobject clazz, jlong objPtr) { 
const char* const kClassPathName = "android/view/RenderNodeAnimator";



static JNINativeMethod gMethods[] = {

#ifdef USE_OPENGL_RENDERER

    { "nCreateAnimator", "(Ljava/lang/ref/WeakReference;IIF)J", (void*) createAnimator },

    { "nSetDuration", "(JI)V", (void*) setDuration },

    { "nUnref", "(J)V", (void*) unref },

#endif

};



#define FIND_CLASS(var, className) \

core/jni/android_view_RenderNodeAnimator.h

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


#include "jni.h"



#ifdef USE_OPENGL_RENDERER



#include <Animator.h>



namespace android {
@@ -34,3 +36,5 @@ private: 
};



}



#endif