summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2010-07-12 17:22:32 -0700
committerShimeng (Simon) Wang <swang@google.com>2010-07-12 17:22:32 -0700
commit7b51725d512a0325ec45b83a86c2b8ae6f2d90b4 (patch)
treed719f3a9764f42543d4ceb0fa9befd840e0e50eb /Android.mk
parent53451870e9ac7ef67aa76fdd8c1cf47eafaa8763 (diff)
downloadexternal_webkit-7b51725d512a0325ec45b83a86c2b8ae6f2d90b4.zip
external_webkit-7b51725d512a0325ec45b83a86c2b8ae6f2d90b4.tar.gz
external_webkit-7b51725d512a0325ec45b83a86c2b8ae6f2d90b4.tar.bz2
Implements the lastHyphenLocation for Android.
Upstream webkit implemented the hyphenation working draft http://www.w3.org/TR/2010/WD-css3-gcpm-20100608/#hyphenation in: http://trac.webkit.org/changeset/61548 This change implements the interface function for Android. English only support for now. Issue: 2672163 Change-Id: I6763adc0ff56de1431bdb09e79b110b30bac01d1
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index cc58cf7..d5ed3ed 100644
--- a/Android.mk
+++ b/Android.mk
@@ -107,6 +107,7 @@ LOCAL_C_INCLUDES := \
external/icu4c/i18n \
external/libxml2/include \
external/libxslt \
+ external/hyphenation \
external/skia/emoji \
external/skia/include/core \
external/skia/include/effects \
@@ -316,7 +317,7 @@ LOCAL_CFLAGS += -DSUPPORT_COMPLEX_SCRIPTS=1
endif
# Build the list of static libraries
-LOCAL_STATIC_LIBRARIES := libxml2 libxslt
+LOCAL_STATIC_LIBRARIES := libxml2 libxslt libhyphenation
ifeq ($(JAVASCRIPT_ENGINE),v8)
LOCAL_STATIC_LIBRARIES += libv8
endif