diff options
| author | John Reck <jreck@google.com> | 2014-12-18 13:52:33 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2014-12-18 14:12:27 -0800 |
| commit | a2732a2bf98f7dbd063f4e5679f5b8bfcbec2698 (patch) | |
| tree | a76c30565972fb62055bf9d0da1921e452bc2ab2 /core/jni/android_view_RenderNode.cpp | |
| parent | 35cf58ab283a784b0dbdeeb8fa5a620a34030b35 (diff) | |
| download | frameworks_base-a2732a2bf98f7dbd063f4e5679f5b8bfcbec2698.zip frameworks_base-a2732a2bf98f7dbd063f4e5679f5b8bfcbec2698.tar.gz frameworks_base-a2732a2bf98f7dbd063f4e5679f5b8bfcbec2698.tar.bz2 | |
Stop pretending USE_OPENGL_RENDERER is a thing
Change-Id: I732b490431fe90eafa00a00f3b5429f0d3a067e6
Diffstat (limited to 'core/jni/android_view_RenderNode.cpp')
| -rw-r--r-- | core/jni/android_view_RenderNode.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/core/jni/android_view_RenderNode.cpp b/core/jni/android_view_RenderNode.cpp index a1d3bc6..2b5a961 100644 --- a/core/jni/android_view_RenderNode.cpp +++ b/core/jni/android_view_RenderNode.cpp @@ -34,13 +34,6 @@ namespace android { using namespace uirenderer; -/** - * Note: OpenGLRenderer JNI layer is generated and compiled only on supported - * devices. This means all the logic must be compiled only when the - * preprocessor variable USE_OPENGL_RENDERER is defined. - */ -#ifdef USE_OPENGL_RENDERER - #define SET_AND_DIRTY(prop, val, dirtyFlag) \ (reinterpret_cast<RenderNode*>(renderNodePtr)->mutateStagingProperties().prop(val) \ ? (reinterpret_cast<RenderNode*>(renderNodePtr)->setPropertyFieldsDirty(dirtyFlag), true) \ @@ -469,8 +462,6 @@ static void android_view_RenderNode_endAllAnimators(JNIEnv* env, jobject clazz, renderNode->animators().endAllStagingAnimators(); } -#endif // USE_OPENGL_RENDERER - // ---------------------------------------------------------------------------- // JNI Glue // ---------------------------------------------------------------------------- @@ -478,7 +469,6 @@ static void android_view_RenderNode_endAllAnimators(JNIEnv* env, jobject clazz, const char* const kClassPathName = "android/view/RenderNode"; static JNINativeMethod gMethods[] = { -#ifdef USE_OPENGL_RENDERER { "nCreate", "(Ljava/lang/String;)J", (void*) android_view_RenderNode_create }, { "nDestroyRenderNode", "(J)V", (void*) android_view_RenderNode_destroyRenderNode }, { "nSetDisplayListData", "(JJ)V", (void*) android_view_RenderNode_setDisplayListData }, @@ -550,7 +540,6 @@ static JNINativeMethod gMethods[] = { { "nAddAnimator", "(JJ)V", (void*) android_view_RenderNode_addAnimator }, { "nEndAllAnimators", "(J)V", (void*) android_view_RenderNode_endAllAnimators }, -#endif }; int register_android_view_RenderNode(JNIEnv* env) { |