summaryrefslogtreecommitdiffstats
path: root/WebCore/Android.mk
diff options
context:
space:
mode:
authorNicolas Roard <nicolas@android.com>2010-01-04 11:41:10 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-04 11:41:10 -0800
commit870689c8f0b388ea29f06a711f09258d910cf0ff (patch)
tree97f62cc64e391bde4a9436791e844dda7ed3f76a /WebCore/Android.mk
parent66367cf8feab200c0ed1d18e52f9eab21c80cea0 (diff)
parent9acd586e4a0aa54e4f630665aa0d3c8c95b78e72 (diff)
downloadexternal_webkit-870689c8f0b388ea29f06a711f09258d910cf0ff.zip
external_webkit-870689c8f0b388ea29f06a711f09258d910cf0ff.tar.gz
external_webkit-870689c8f0b388ea29f06a711f09258d910cf0ff.tar.bz2
am 9acd586e: webkit layers support
Merge commit '9acd586e4a0aa54e4f630665aa0d3c8c95b78e72' into eclair-mr2-plus-aosp * commit '9acd586e4a0aa54e4f630665aa0d3c8c95b78e72': webkit layers support
Diffstat (limited to 'WebCore/Android.mk')
-rw-r--r--WebCore/Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 46d9caa..0ab375b 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -449,6 +449,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
platform/graphics/StringTruncator.cpp \
platform/graphics/WidthIterator.cpp \
\
+ platform/graphics/android/AndroidAnimation.cpp \
platform/graphics/android/BitmapAllocatorAndroid.cpp \
platform/graphics/android/FontAndroid.cpp \
platform/graphics/android/FontCacheAndroid.cpp \
@@ -458,9 +459,11 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
platform/graphics/android/GlyphMapAndroid.cpp \
platform/graphics/android/GradientAndroid.cpp \
platform/graphics/android/GraphicsContextAndroid.cpp \
+ platform/graphics/android/GraphicsLayerAndroid.cpp \
platform/graphics/android/ImageAndroid.cpp \
platform/graphics/android/ImageBufferAndroid.cpp \
platform/graphics/android/ImageSourceAndroid.cpp \
+ platform/graphics/android/LayerAndroid.cpp \
platform/graphics/android/PathAndroid.cpp \
platform/graphics/android/PatternAndroid.cpp \
platform/graphics/android/PlatformGraphicsContext.cpp \