aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2013-08-27 16:51:26 -0400
committerLeon Scroggins III <scroggo@google.com>2013-08-27 17:06:35 -0400
commit404e5726adadda5aedc12705f662aa471981ec3f (patch)
tree0c36c15453be07bc7df8a3c84439e29b7b7fb2aa /Android.mk
parent4495d5ff20e5a4923d708fa335371f0c8e9b2752 (diff)
downloadskia-404e5726adadda5aedc12705f662aa471981ec3f.tar.gz
Remove decoders' dependence on getLength.
Skia's decoders were calling getLength, which is not always a reasonable call to make. This CL cherry-picks three changes from Skia which remove the dependency. cherry-pick of https://skia.googlecode.com/svn/trunk@10848 cherry-pick of https://skia.googlecode.com/svn/trunk@10849 cherry-pick of https://skia.googlecode.com/svn/trunk@10850 (Also modified Android.mk to include SkStreamHelpers.) BUG:8432093 Change-Id: I271077eeaaf3fa11487ae30c188acd764fc494a6
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 7d8037c6d3..272b840ee1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -303,6 +303,7 @@ LOCAL_SRC_FILES:= \
src/images/SkMovie_gif.cpp \
src/images/SkPageFlipper.cpp \
src/images/SkScaledBitmapSampler.cpp \
+ src/images/SkStreamHelpers.cpp \
src/pathops/SkAddIntersections.cpp \
src/pathops/SkDCubicIntersection.cpp \
src/pathops/SkDCubicLineIntersection.cpp \