summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-02-02 18:46:10 +0000
committerSteve Block <steveblock@google.com>2010-02-04 22:46:59 +0000
commit9c4df4389f9d998ce8b59b1665a018b69a2eb865 (patch)
tree938ee942cded36361be8f4a3e257dd9649472784 /Android.mk
parent77dd3843724f8ca0ae8084012c79af6ffbaef528 (diff)
downloadexternal_webkit-9c4df4389f9d998ce8b59b1665a018b69a2eb865.zip
external_webkit-9c4df4389f9d998ce8b59b1665a018b69a2eb865.tar.gz
external_webkit-9c4df4389f9d998ce8b59b1665a018b69a2eb865.tar.bz2
Merge webkit.org at r54127 : GIFImageDecoder now requires ImageDecoder.
ImageDecoder requires numerous additional include paths. Change-Id: I047d36db7b5f28e7602f55eeeedc04beb713c079
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 3394be3..b9cd7e8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -116,6 +116,11 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(LOCAL_PATH)/WebCore/platform/graphics/skia \
$(LOCAL_PATH)/WebCore/platform/graphics/transforms \
$(LOCAL_PATH)/WebCore/platform/image-decoders \
+ $(LOCAL_PATH)/WebCore/platform/image-decoders/bmp \
+ $(LOCAL_PATH)/WebCore/platform/image-decoders/gif \
+ $(LOCAL_PATH)/WebCore/platform/image-decoders/ico \
+ $(LOCAL_PATH)/WebCore/platform/image-decoders/jpeg \
+ $(LOCAL_PATH)/WebCore/platform/image-decoders/png \
$(LOCAL_PATH)/WebCore/platform/mock \
$(LOCAL_PATH)/WebCore/platform/network \
$(LOCAL_PATH)/WebCore/platform/network/android \