summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-30 08:25:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-30 08:25:13 -0700
commit88c8b22657f6cfd1269219430aa31c5ecb03faba (patch)
treeb90072fd4e7f70616947bf8b42ff7963ace1e100
parentf2b8b88d1a8fefaf6de6c6bce24ae092abdf9584 (diff)
parent9b636ce4cb6c82baac597c70089627231fccb300 (diff)
downloadexternal_webkit-88c8b22657f6cfd1269219430aa31c5ecb03faba.zip
external_webkit-88c8b22657f6cfd1269219430aa31c5ecb03faba.tar.gz
external_webkit-88c8b22657f6cfd1269219430aa31c5ecb03faba.tar.bz2
am 9b636ce4: Merge "webkit: enable no-pic compiling option"
* commit '9b636ce4cb6c82baac597c70089627231fccb300': webkit: enable no-pic compiling option
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 61bd467..12fbb59 100644
--- a/Android.mk
+++ b/Android.mk
@@ -252,6 +252,10 @@ LOCAL_CFLAGS += -Darm
LOCAL_CFLAGS += -Wno-psabi
endif
+ifeq ($(TARGET_ARCH_VARIANT),x86-atom)
+LOCAL_CFLAGS += -fno-pic
+endif
+
# need a flag to tell the C side when we're on devices with large memory
# budgets (i.e. larger than the low-end devices that initially shipped)
ifeq ($(ARCH_ARM_HAVE_VFP),true)