diff options
| author | John Reck <jreck@google.com> | 2014-03-15 00:25:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-15 00:25:34 +0000 |
| commit | 759067f39a635b4c821fc17b56253bcd056ada47 (patch) | |
| tree | 8879b3d2e717999b0f1874f182a32c86765698d9 /core/jni/AndroidRuntime.cpp | |
| parent | 5dac28f59d3a214d1e4b48b1bef11071bdff830f (diff) | |
| parent | ef09d8cf946443e7f4ac4541f843368ac4338c59 (diff) | |
| download | frameworks_base-759067f39a635b4c821fc17b56253bcd056ada47.zip frameworks_base-759067f39a635b4c821fc17b56253bcd056ada47.tar.gz frameworks_base-759067f39a635b4c821fc17b56253bcd056ada47.tar.bz2 | |
Merge "Rename DisplayList->RenderNode"
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index d8cf18e..9a7a5f9 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -119,7 +119,7 @@ extern int register_android_graphics_SurfaceTexture(JNIEnv* env); extern int register_android_graphics_Xfermode(JNIEnv* env); extern int register_android_graphics_pdf_PdfDocument(JNIEnv* env); extern int register_android_view_DisplayEventReceiver(JNIEnv* env); -extern int register_android_view_DisplayList(JNIEnv* env); +extern int register_android_view_RenderNode(JNIEnv* env); extern int register_android_view_GraphicBuffer(JNIEnv* env); extern int register_android_view_GLES20Canvas(JNIEnv* env); extern int register_android_view_GLRenderer(JNIEnv* env); @@ -1179,7 +1179,7 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_nio_utils), REG_JNI(register_android_graphics_Graphics), REG_JNI(register_android_view_DisplayEventReceiver), - REG_JNI(register_android_view_DisplayList), + REG_JNI(register_android_view_RenderNode), REG_JNI(register_android_view_GraphicBuffer), REG_JNI(register_android_view_GLES20Canvas), REG_JNI(register_android_view_GLRenderer), |