summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-30 10:36:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-30 10:36:23 -0700
commit76150b639b267a6f89506ad9b75c7eae5e2b60c2 (patch)
tree8d55fe6cf55df487fd5753838a3502b4f8b861ac
parent88c8b22657f6cfd1269219430aa31c5ecb03faba (diff)
parent5423878ee1cb0965ced62800f36933841eaa40f6 (diff)
downloadexternal_webkit-76150b639b267a6f89506ad9b75c7eae5e2b60c2.zip
external_webkit-76150b639b267a6f89506ad9b75c7eae5e2b60c2.tar.gz
external_webkit-76150b639b267a6f89506ad9b75c7eae5e2b60c2.tar.bz2
am 5423878e: Merge "Enable dynamic effect of GIF animating images in browser"
* commit '5423878ee1cb0965ced62800f36933841eaa40f6': Enable dynamic effect of GIF animating images in browser
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 12fbb59..6759a84 100644
--- a/Android.mk
+++ b/Android.mk
@@ -262,6 +262,10 @@ ifeq ($(ARCH_ARM_HAVE_VFP),true)
LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE
endif
+ifeq ($(TARGET_ARCH),x86)
+LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE
+endif
+
ifeq ($(ENABLE_SVG),true)
LOCAL_CFLAGS += -DENABLE_SVG=1 -DENABLE_SVG_ANIMATION=1
endif