diff options
| author | Patrick Scott <phanna@android.com> | 2009-10-20 11:30:21 -0400 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-11-15 12:51:46 -0800 |
| commit | 18342a41ab72e2c21931afaaab6f1b9bdbedb9fa (patch) | |
| tree | cca9b47c54de6b940a2c3960af3ea9e7a42c57c0 | |
| parent | 19b276ff1f54bed5c687bef385cb6d8c33332d56 (diff) | |
| download | external_webkit-18342a41ab72e2c21931afaaab6f1b9bdbedb9fa.zip external_webkit-18342a41ab72e2c21931afaaab6f1b9bdbedb9fa.tar.gz external_webkit-18342a41ab72e2c21931afaaab6f1b9bdbedb9fa.tar.bz2 | |
Fix spurious build breaks.
Split libwebcore.a into libwebcore.a and libjs.a and then link them together.
| -rw-r--r-- | Android.jsc.mk | 38 | ||||
| -rw-r--r-- | JavaScriptCore/Android.mk | 4 |
2 files changed, 28 insertions, 14 deletions
diff --git a/Android.jsc.mk b/Android.jsc.mk index 24433cf..790aa47 100644 --- a/Android.jsc.mk +++ b/Android.jsc.mk @@ -29,13 +29,6 @@ WEBKIT_SRC_FILES := # We have to use bison 2.3 include $(BASE_PATH)/bison_check.mk -# Include source files for JavaScriptCore -d := JavaScriptCore -LOCAL_PATH := $(BASE_PATH)/$d -intermediates := $(base_intermediates)/$d -include $(LOCAL_PATH)/Android.mk -WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) - # Include source files for WebCore d := WebCore LOCAL_PATH := $(BASE_PATH)/$d @@ -168,9 +161,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/JavaScriptCore/wtf/unicode \ $(LOCAL_PATH)/JavaScriptCore/wtf/unicode/icu \ $(LOCAL_PATH)/JavaScriptCore/ForwardingHeaders \ - $(base_intermediates)/JavaScriptCore \ - $(base_intermediates)/JavaScriptCore/parser \ - $(base_intermediates)/JavaScriptCore/runtime \ $(base_intermediates)/WebCore/ \ $(base_intermediates)/WebCore/bindings/js \ $(base_intermediates)/WebCore/css \ @@ -236,6 +226,32 @@ WEBKIT_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) # Build the library all at once include $(BUILD_STATIC_LIBRARY) +# Now build libjs as a static library. +include $(CLEAR_VARS) +LOCAL_MODULE := libjs +LOCAL_LDLIBS := $(WEBKIT_LDLIBS) +LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES) +LOCAL_STATIC_LIBRARIES := $(WEBKIT_STATIC_LIBRARIES) +LOCAL_CFLAGS := $(WEBKIT_CFLAGS) +# Include source files for JavaScriptCore +d := JavaScriptCore +LOCAL_PATH := $(BASE_PATH)/$d +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +# Cannot use base_intermediates as this is a new module +intermediates := $(call local-intermediates-dir) +include $(LOCAL_PATH)/Android.mk +# Redefine LOCAL_SRC_FILES with the correct prefix +LOCAL_SRC_FILES := $(addprefix $d/,$(LOCAL_SRC_FILES)) +# Use the base path to resolve file names +LOCAL_PATH := $(BASE_PATH) +# Append jsc intermediate include paths to the WebKit include list. +LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES) \ + $(intermediates) \ + $(intermediates)/parser \ + $(intermediates)/runtime \ +# Build libjs +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) @@ -244,7 +260,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libwebcore LOCAL_LDLIBS := $(WEBKIT_LDLIBS) LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES) -LOCAL_STATIC_LIBRARIES := libwebcore $(WEBKIT_STATIC_LIBRARIES) +LOCAL_STATIC_LIBRARIES := libwebcore libjs $(WEBKIT_STATIC_LIBRARIES) LOCAL_LDFLAGS := -fvisibility=hidden LOCAL_CFLAGS := $(WEBKIT_CFLAGS) LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES) diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index ca6a792..774ae4c 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -236,6 +236,4 @@ $(CHARTABLES): $(LOCAL_PATH)/pcre/dftables $(CHARTABLES): $(LOCAL_PATH)/pcre/pcre_internal.h $(transform-generated-source) -$(intermediates)/pcre/pcre_tables.o : $(CHARTABLES) - -LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) +LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) $(CHARTABLES) |