summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-08-09 16:46:55 +0100
committerKristian Monsen <kristianm@google.com>2010-08-11 10:48:35 +0100
commitb69fcd13ce2c9cf0b62243d9eaffd47f77e801c0 (patch)
tree6bddb94657d72d01975c1c2b3dc6115d68dfe24f /Android.mk
parentd8c0fb842299e8de5af02d608f46c4f7bd443b1e (diff)
downloadexternal_webkit-b69fcd13ce2c9cf0b62243d9eaffd47f77e801c0.zip
external_webkit-b69fcd13ce2c9cf0b62243d9eaffd47f77e801c0.tar.gz
external_webkit-b69fcd13ce2c9cf0b62243d9eaffd47f77e801c0.tar.bz2
Use libchromium_net as a static library. This saves a lot of space.
Change-Id: Ieb538733c55e685e89df00e79233ac15d13d2825
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk16
1 files changed, 9 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk
index 5d7496b..d4a46db 100644
--- a/Android.mk
+++ b/Android.mk
@@ -315,13 +315,6 @@ LOCAL_SHARED_LIBRARIES := \
libmedia \
libsurfaceflinger_client
-ifeq ($(HTTP_STACK),chrome)
-LOCAL_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) \
- libssl \
- libcrypto \
- libchromium_net
-endif # HTTP_STACK == chrome
-
ifeq ($(WEBCORE_INSTRUMENTATION),true)
LOCAL_SHARED_LIBRARIES += libhardware_legacy
endif
@@ -347,6 +340,11 @@ ifeq ($(JAVASCRIPT_ENGINE),v8)
LOCAL_STATIC_LIBRARIES += libv8
endif
+ifeq ($(HTTP_STACK),chrome)
+LOCAL_STATIC_LIBRARIES += libchromium_net
+LOCAL_SHARED_LIBRARIES += libcrypto libssl libz
+endif # HTTP_STACK == chrome
+
# Redefine LOCAL_SRC_FILES to be all the WebKit source files
LOCAL_SRC_FILES := $(WEBKIT_SRC_FILES)
@@ -393,6 +391,10 @@ endif # JAVASCRIPT_ENGINE == jsc
# will strip out any unused code from the entry point.
include $(CLEAR_VARS)
# if you need to make webcore huge (for debugging), enable this line
+ifeq ($(HTTP_STACK),chrome)
+# Too large for the space with chromium linked in
+LOCAL_PRELINK_MODULE := false
+endif
#LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libwebcore
LOCAL_LDLIBS := $(WEBKIT_LDLIBS)