summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-30 07:53:07 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-08-30 07:53:08 -0700
commit9b636ce4cb6c82baac597c70089627231fccb300 (patch)
treeaee1abd820322beaec1891a270f969e45792ef75
parent5161915319ca55318d2ef68a84b735f01c3d202f (diff)
parent3c01f41e1ae6b1aa0bd1fb6e37bc02fa2ca3c62e (diff)
downloadexternal_webkit-9b636ce4cb6c82baac597c70089627231fccb300.zip
external_webkit-9b636ce4cb6c82baac597c70089627231fccb300.tar.gz
external_webkit-9b636ce4cb6c82baac597c70089627231fccb300.tar.bz2
Merge "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)