summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2010-07-13 08:57:43 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-07-13 08:57:43 -0700
commit552ce5e26f64b38c38262092c22f333a546be0ff (patch)
tree2aace6d0596bf935eddb052b8e99dda44998f026 /Android.mk
parentb72d3304e698fa5ca4ca89009283250d89a72268 (diff)
parent7b51725d512a0325ec45b83a86c2b8ae6f2d90b4 (diff)
downloadexternal_webkit-552ce5e26f64b38c38262092c22f333a546be0ff.zip
external_webkit-552ce5e26f64b38c38262092c22f333a546be0ff.tar.gz
external_webkit-552ce5e26f64b38c38262092c22f333a546be0ff.tar.bz2
Merge "Implements the lastHyphenLocation for Android."
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