summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-05-26 11:33:23 +0100
committerSteve Block <steveblock@google.com>2010-05-27 11:16:16 +0100
commit015ed43c039417e12bbef7b2fe1b67f88de5ed44 (patch)
treeb77e0d308631cf13c529d10ab1d369497be5363a /Android.mk
parent1e6338658628fcabd955cf65687a30976c7893ce (diff)
downloadexternal_webkit-015ed43c039417e12bbef7b2fe1b67f88de5ed44.zip
external_webkit-015ed43c039417e12bbef7b2fe1b67f88de5ed44.tar.gz
external_webkit-015ed43c039417e12bbef7b2fe1b67f88de5ed44.tar.bz2
Merge WebKit at r60074: Fix Android makefiles
Change-Id: I549373cf00e9cc72060eccaf55e6a3efb0623df0
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 ee1104d..fa50cfe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -150,6 +150,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(LOCAL_PATH)/WebCore/platform/network/android \
$(LOCAL_PATH)/WebCore/platform/sql \
$(LOCAL_PATH)/WebCore/platform/text \
+ $(LOCAL_PATH)/WebCore/platform/text/transcoder \
$(LOCAL_PATH)/WebCore/plugins \
$(LOCAL_PATH)/WebCore/plugins/android \
$(LOCAL_PATH)/WebCore/rendering \