summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Kwan <dougkwan@google.com>2010-07-01 11:52:11 -0700
committerDoug Kwan <dougkwan@google.com>2010-07-01 11:52:11 -0700
commit4d9904fcc4161d144bfd84ca9d294f21d55444d2 (patch)
tree4fb6d8a9043e3b892e3e15ddf87795f3ae3204e5
parent60950638e3cf833c59b11f87d2cf170bfb8e169b (diff)
downloadexternal_webkit-4d9904fcc4161d144bfd84ca9d294f21d55444d2.zip
external_webkit-4d9904fcc4161d144bfd84ca9d294f21d55444d2.tar.gz
external_webkit-4d9904fcc4161d144bfd84ca9d294f21d55444d2.tar.bz2
Disable ICF for libwebcore.so
Change-Id: I314231a5f7d831f940b8cbc7c1d5bcd0fe09424e
-rw-r--r--Android.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 4b93ede..5fddb9f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -374,6 +374,13 @@ ifeq ($(JAVASCRIPT_ENGINE),jsc)
LOCAL_STATIC_LIBRARIES += libjs
endif
LOCAL_LDFLAGS := -fvisibility=hidden
+
+# Disable ICF for the time being since the browser crahses in tests with
+# ICF enabled.
+ifeq ($(TARGET_ARCH),arm)
+LOCAL_LDFLAGS += -Wl,--icf=none
+endif
+
LOCAL_CFLAGS := $(WEBKIT_CFLAGS)
LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES)
LOCAL_PATH := $(BASE_PATH)