commit b5e74b90b26e6ad7c075d60ff11a14c1fd99230d
author Leon Scroggins III <scroggo@google.com> Wed Oct 26 09:45:45 2016 -0400
committer Leon Scroggins <scroggo@google.com> Thu Oct 27 13:56:58 2016 +0000
tree 4da517788efb9000de8cbe1771cf5e33d84cf236
parent 4bcf5e7c473e9eab4bae3a6bd1c6e323da2e4ba6

Move SkMovie into frameworks/base

Test: Refactor. Relying on existing tests of android.graphics.Movie.

Skia is no longer working on SkMovie, so move it to the only place that
it is used.

Files moved from Skia (all the added files) are unchanged except for
renames (SkMovie -> Movie; SkGIFMovie -> GIFMovie).

Change-Id: I5f12d5def5fe825dda637f8aecf84e73e2dae9ca

core/jni/Android.mk

diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 7950685..506a284 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -119,12 +119,15 @@
     android/graphics/DrawFilter.cpp \
     android/graphics/FontFamily.cpp \
     android/graphics/CreateJavaOutputStreamAdaptor.cpp \
+    android/graphics/GIFMovie.cpp \
     android/graphics/Graphics.cpp \
     android/graphics/HarfBuzzNGFaceSkia.cpp \
     android/graphics/Interpolator.cpp \
     android/graphics/MaskFilter.cpp \
     android/graphics/Matrix.cpp \
     android/graphics/Movie.cpp \
+    android/graphics/MovieImpl.cpp \
+    android/graphics/Movie_FactoryDefault.cpp \
     android/graphics/NinePatch.cpp \
     android/graphics/NinePatchPeeker.cpp \
     android/graphics/Paint.cpp \
@@ -200,6 +203,7 @@
     $(TOP)/system/core/include \
     $(TOP)/system/media/camera/include \
     $(TOP)/system/netd/include \
+    external/giflib \
     external/pdfium/core/include/fpdfapi \
     external/pdfium/fpdfsdk/include \
     external/pdfium/public \
@@ -219,6 +223,9 @@
     external/freetype/include
 # TODO: clean up Minikin so it doesn't need the freetype include
 
+LOCAL_STATIC_LIBRARIES := \
+    libgif \
+
 LOCAL_SHARED_LIBRARIES := \
     libmemtrack \
     libandroidfw \