diff options
| author | Patrick Scott <phanna@android.com> | 2009-05-12 11:43:16 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2009-05-12 13:55:25 -0400 |
| commit | eb0d79a86d66f3b4ae7bb422a57b7abe82878d5a (patch) | |
| tree | 187f72ad28b8be399d9d0c42d7ddb7f726078a6c /Android.mk | |
| parent | b1f12fcd97f02fccc9c9e3582281eae09dd5a211 (diff) | |
| download | external_webkit-eb0d79a86d66f3b4ae7bb422a57b7abe82878d5a.zip external_webkit-eb0d79a86d66f3b4ae7bb422a57b7abe82878d5a.tar.gz external_webkit-eb0d79a86d66f3b4ae7bb422a57b7abe82878d5a.tar.bz2 | |
Shave ~60k off of libwebcore.so and make webcore_test always build.
Build libwebcore as a static library first. Then build it as a shared library
using the jni entry point as the single source file. This strips uneeded code
out of the final library.
Have webcore_test link against the static library so that the symbols are all
visible. Update webcore_test to link against the new webkit drop as well.
Rearrange the main makefile to create WEBKIT_* variables that a sub-makefile
like webcore_test can use to define includes, cflags, and libraries. Manually
add a dependency on the generated webkit source files.
Verified that svg and v8 work as well as the simulator.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 37 |
1 files changed, 31 insertions, 6 deletions
@@ -23,7 +23,7 @@ include $(CLEAR_VARS) # Define our module and find the intermediates directory LOCAL_MODULE := libwebcore -LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_CLASS := STATIC_LIBRARIES base_intermediates := $(call local-intermediates-dir) # Using := here prevents recursive expansion @@ -94,9 +94,10 @@ LOCAL_PATH := $(BASE_PATH) LOCAL_CFLAGS += -Wno-endif-labels -Wno-import -Wno-format LOCAL_CFLAGS += -fno-strict-aliasing LOCAL_CFLAGS += -include "WebCorePrefixAndroid.h" +LOCAL_CFLAGS += -fvisibility=hidden ifeq ($(TARGET_ARCH),arm) -LOCAL_CFLAGS += -Darm -fvisibility=hidden +LOCAL_CFLAGS += -Darm endif ifeq ($(ENABLE_SVG),true) @@ -136,6 +137,7 @@ LOCAL_C_INCLUDES := \ external/skia/src/ports \ external/sqlite/dist \ frameworks/base/core/jni/android/graphics \ + $(LOCAL_PATH) \ $(LOCAL_PATH)/WebCore \ $(LOCAL_PATH)/WebCore/css \ $(LOCAL_PATH)/WebCore/dom \ @@ -231,7 +233,30 @@ endif # Redefine LOCAL_SRC_FILES to be all the WebKit source files LOCAL_SRC_FILES := $(WEBKIT_SRC_FILES) +# Define this for use in other makefiles. +WEBKIT_C_INCLUDES := $(LOCAL_C_INCLUDES) +WEBKIT_CFLAGS := $(LOCAL_CFLAGS) +WEBKIT_GENERATED_SOURCES := $(LOCAL_GENERATED_SOURCES) +WEBKIT_LDLIBS := $(LOCAL_LDLIBS) +WEBKIT_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) +WEBKIT_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) + # Build the library all at once +include $(BUILD_STATIC_LIBRARY) + +# Now build the shared library using only the exported jni entry point. This +# will strip out any unused code from the entry point. +include $(CLEAR_VARS) +LOCAL_MODULE := libwebcore +LOCAL_LDLIBS := $(WEBKIT_LDLIBS) +LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES) +LOCAL_STATIC_LIBRARIES := libwebcore $(WEBKIT_STATIC_LIBRARIES) +LOCAL_LDFLAGS := -fvisibility=hidden +LOCAL_CFLAGS := $(WEBKIT_CFLAGS) +LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES) +LOCAL_PATH := $(BASE_PATH) +LOCAL_SRC_FILES := \ + WebKit/android/jni/WebCoreJniOnLoad.cpp include $(BUILD_SHARED_LIBRARY) # Build the plugin test separately from libwebcore @@ -240,10 +265,10 @@ include $(BASE_PATH)/WebKit/android/plugins/sample/Android.mk # Build the wds client include $(BASE_PATH)/WebKit/android/wds/client/Android.mk -# Build the performance command line tool. -# XXX: Uncomment this include to build webcore_test. In order for the test to -# link with libwebcore, remove -fvisibility=hidden from LOCAL_CFLAGS above -#include $(BASE_PATH)/perf/Android.mk +# Build the performance command line tool but only if v8 is disabled. +#ifneq ($(ENABLE_V8),true) +include $(BASE_PATH)/perf/Android.mk +#endif # Build the webkit merge tool. include $(BASE_PATH)/WebKitTools/android/webkitmerge/Android.mk |