summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2010-05-03 17:54:32 -0700
committerShimeng (Simon) Wang <swang@google.com>2010-05-04 13:18:05 -0700
commitbd1f87523f02a8c251587c4dc0d6199465a6a401 (patch)
tree9098d7f141b726c3c20cc191593dd6218a2193f9 /Android.mk
parent59425e1dce108ed470c787c3c7fc9a9928aa114d (diff)
downloadexternal_webkit-bd1f87523f02a8c251587c4dc0d6199465a6a401.zip
external_webkit-bd1f87523f02a8c251587c4dc0d6199465a6a401.tar.gz
external_webkit-bd1f87523f02a8c251587c4dc0d6199465a6a401.tar.bz2
Enable SVG compiling in gingerbread.
Compiled successfully for both V8 and JSC. The libwebcore size changes from 5354080 to 6072344, the diff is 700KB. Change-Id: Id95abd8b8f2181ed7789a95e0675cb8436e11bf7
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk13
1 files changed, 7 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index 945fcd4..e73f5b8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,6 +25,12 @@
LOCAL_PATH := $(call my-dir)
+# Control SVG compiling in webkit.
+# Default is true unless explictly disabled.
+ifneq ($(ENABLE_SVG),false)
+ ENABLE_SVG = true
+endif
+
# Two ways to control which JS engine is used:
# 1. use JS_ENGINE environment variable, value can be either 'jsc' or 'v8'
# This is the preferred way.
@@ -245,7 +251,7 @@ LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE
endif
ifeq ($(ENABLE_SVG),true)
-LOCAL_CFLAGS += -DENABLE_SVG=1
+LOCAL_CFLAGS += -DENABLE_SVG=1 -DENABLE_SVG_ANIMATION=1
endif
ifeq ($(ENABLE_WTF_USE_ACCELERATED_COMPOSITING),false)
@@ -256,11 +262,6 @@ ifeq ($(ENABLE_WTF_USE_ACCELERATED_COMPOSITING),true)
LOCAL_CFLAGS += -DWTF_USE_ACCELERATED_COMPOSITING=1
endif
-# Temporary disable SVG_ANIMATION.
-ifeq ($(ENABLE_SVG_ANIMATION),true)
-LOCAL_CFLAGS += -DENABLE_SVG_ANIMATION=1
-endif
-
ifeq ($(WEBCORE_INSTRUMENTATION),true)
LOCAL_CFLAGS += -DANDROID_INSTRUMENT
endif