diff options
| -rw-r--r-- | core/jni/Android.mk | 1 | ||||
| -rw-r--r-- | core/jni/android/graphics/BitmapRegionDecoder.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android/graphics/Canvas.cpp | 3 | ||||
| -rw-r--r-- | core/jni/android_view_ViewRoot.cpp | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 4f04531f836b..bd0d9b98e015 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -177,7 +177,6 @@ LOCAL_SHARED_LIBRARIES := \ libgui \ libsurfaceflinger_client \ libcamera_client \ - libskiagl \ libskia \ libsqlite \ libdvm \ diff --git a/core/jni/android/graphics/BitmapRegionDecoder.cpp b/core/jni/android/graphics/BitmapRegionDecoder.cpp index 91a82026235b..cb2ad742e085 100644 --- a/core/jni/android/graphics/BitmapRegionDecoder.cpp +++ b/core/jni/android/graphics/BitmapRegionDecoder.cpp @@ -94,7 +94,7 @@ static jobject doBuildTileIndex(JNIEnv* env, SkStream* stream) { return nullObjectReturn("decoder->buildTileIndex returned false"); } - SkBitmapRegionDecoder *bm = new SkBitmapRegionDecoder(decoder, width, height); + SkBitmapRegionDecoder *bm = new SkBitmapRegionDecoder(decoder, stream, width, height); return GraphicsJNI::createBitmapRegionDecoder(env, bm); } diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp index 6c616894aff4..c2365ffca85e 100644 --- a/core/jni/android/graphics/Canvas.cpp +++ b/core/jni/android/graphics/Canvas.cpp @@ -61,12 +61,11 @@ public: } static SkCanvas* initGL(JNIEnv* env, jobject) { - return new SkGLCanvas; + return 0; } static void freeCaches(JNIEnv* env, jobject) { // these are called in no particular order - SkGLCanvas::DeleteAllTextures(); SkImageRef_GlobalPool::SetRAMUsed(0); SkGraphics::SetFontCacheUsed(0); } diff --git a/core/jni/android_view_ViewRoot.cpp b/core/jni/android_view_ViewRoot.cpp index 5173bb89757c..0b13ef910d3b 100644 --- a/core/jni/android_view_ViewRoot.cpp +++ b/core/jni/android_view_ViewRoot.cpp @@ -77,7 +77,6 @@ static void android_view_ViewRoot_showFPS(JNIEnv* env, jobject, jobject jcanvas, } static void android_view_ViewRoot_abandonGlCaches(JNIEnv* env, jobject) { - SkGLCanvas::AbandonAllTextures(); } |