diff options
| author | Doug Kwan <dougkwan@google.com> | 2010-07-01 13:52:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-01 13:52:15 -0700 |
| commit | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (patch) | |
| tree | 4507698036bdff4288158ed060b28e1698f326ef | |
| parent | e7023b0b4fdee9e2b1f503e8fdea2aeeb1d4a914 (diff) | |
| parent | 4d9904fcc4161d144bfd84ca9d294f21d55444d2 (diff) | |
| download | external_webkit-72aad67af14193199e29cdd5c4ddc095a8b9a8a8.zip external_webkit-72aad67af14193199e29cdd5c4ddc095a8b9a8a8.tar.gz external_webkit-72aad67af14193199e29cdd5c4ddc095a8b9a8a8.tar.bz2 | |
Merge "Disable ICF for libwebcore.so"
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -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) |