aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-30 10:36:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-30 10:36:24 -0700
commita223e0da1c4693214de7e299e7d4103df917a77f (patch)
tree96dfe3c07b4dd37d55ec4534ebb25dc962fa227b
parent1dccc9f3e889a5b702ec201129db689ab64a5eb8 (diff)
parent2f12560c46585b0b3649ffc3580ff6e86299102e (diff)
downloadexternal_skia-a223e0da1c4693214de7e299e7d4103df917a77f.zip
external_skia-a223e0da1c4693214de7e299e7d4103df917a77f.tar.gz
external_skia-a223e0da1c4693214de7e299e7d4103df917a77f.tar.bz2
am 2f12560c: Merge "Enable dynamic effect of GIF animating images in browser"
* commit '2f12560c46585b0b3649ffc3580ff6e86299102e': 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 613a90f..e293780 100644
--- a/Android.mk
+++ b/Android.mk
@@ -39,6 +39,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
+
ifneq ($(ARCH_ARM_HAVE_VFP),true)
LOCAL_CFLAGS += -DSK_SOFTWARE_FLOAT
endif