summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-30 08:30:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-30 08:30:23 -0700
commit9f828fb069693bb0f83ce7e2a82bb00ccecec969 (patch)
tree29ce7ccb7e1d89914ba87ab4de8b0082a33b9b45 /Android.mk
parent9976df9e944fed76ce8c5b22b6317a63117c4e40 (diff)
parent88c8b22657f6cfd1269219430aa31c5ecb03faba (diff)
downloadexternal_webkit-9f828fb069693bb0f83ce7e2a82bb00ccecec969.zip
external_webkit-9f828fb069693bb0f83ce7e2a82bb00ccecec969.tar.gz
external_webkit-9f828fb069693bb0f83ce7e2a82bb00ccecec969.tar.bz2
am 88c8b226: am 9b636ce4: Merge "webkit: enable no-pic compiling option"
* commit '88c8b22657f6cfd1269219430aa31c5ecb03faba': webkit: enable no-pic compiling option
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index f3e9fad..c9e9967 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)