aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-30 10:41:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-30 10:41:21 -0700
commit2f7c075a731da5b1ca95509ed657082ac7e2229b (patch)
tree191ddbb002f6419ef48f2971b4ef48ead8d60a45
parent3bd7488e6bad28fab3c32b4c44e37891655bc033 (diff)
parenta223e0da1c4693214de7e299e7d4103df917a77f (diff)
downloadexternal_skia-2f7c075a731da5b1ca95509ed657082ac7e2229b.zip
external_skia-2f7c075a731da5b1ca95509ed657082ac7e2229b.tar.gz
external_skia-2f7c075a731da5b1ca95509ed657082ac7e2229b.tar.bz2
am a223e0da: am 2f12560c: Merge "Enable dynamic effect of GIF animating images in browser"
* commit 'a223e0da1c4693214de7e299e7d4103df917a77f': 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 c240d69..28d2d8e 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