summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2010-06-08 13:10:33 -0700
committerAndy McFadden <fadden@android.com>2010-06-08 13:10:33 -0700
commit3f850c8cca17a6dcd601ed73b9b5ac654b0ec482 (patch)
tree27d45311a5ab78e1851393f4dcd75bed9539776b /Android.mk
parent65e1daa0f8c3d169ec216f3bb1d2d460a395abbd (diff)
downloadexternal_webkit-3f850c8cca17a6dcd601ed73b9b5ac654b0ec482.zip
external_webkit-3f850c8cca17a6dcd601ed73b9b5ac654b0ec482.tar.gz
external_webkit-3f850c8cca17a6dcd601ed73b9b5ac654b0ec482.tar.bz2
Fix build.
Fix build by bracketing use of --stub-group-size with "!sim". Change-Id: I910dd80f743f22bae56e6329ad52f0889a73514a
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index e8c2f08..c3a8dd5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -359,10 +359,12 @@ ifeq ($(JAVASCRIPT_ENGINE),jsc)
LOCAL_STATIC_LIBRARIES += libjs
endif
LOCAL_LDFLAGS := -fvisibility=hidden
+ifneq ($(TARGET_SIMULATOR),true)
# This is required to work around a gold problem. This can be removed once
# gold is fixed. Gold generates more stubs than ld so it is easier for gold
# to have too many stubs in a stub group.
LOCAL_LDFLAGS += -Wl,--stub-group-size=1024276
+endif
LOCAL_CFLAGS := $(WEBKIT_CFLAGS)
LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES)