diff options
| author | Feng Qian <fqian@google.com> | 2009-04-24 15:55:58 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-04-24 15:55:58 -0700 |
| commit | ac888b0a574d343996d06d2b084eaebab7846d81 (patch) | |
| tree | f76fff761b7329e5f3828686c3d6b10d2d5331cc | |
| parent | 4302d48a802631ab8804e96e3f2dc3c40b68bba8 (diff) | |
| download | external_webkit-ac888b0a574d343996d06d2b084eaebab7846d81.zip external_webkit-ac888b0a574d343996d06d2b084eaebab7846d81.tar.gz external_webkit-ac888b0a574d343996d06d2b084eaebab7846d81.tar.bz2 | |
Build V8 as a static library.
To switch between jsc and v8, one needs to edit webkit/Android.mk to change the value of JS_ENGINE, make sure no white space after 'jsc' or 'v8'.
| -rw-r--r-- | Android.mk | 19 | ||||
| -rw-r--r-- | v8/Android.mk | 4 | ||||
| -rw-r--r-- | v8/Android.v8shell.mk | 2 |
3 files changed, 16 insertions, 9 deletions
@@ -34,7 +34,7 @@ include $(BASE_PATH)/bison_check.mk # Define the JS engine used, either jsc or v8. # Be careful not to have white spaces after the line. -JS_ENGINE := jsc +JS_ENGINE := v8 ifeq ($(JS_ENGINE),jsc) # Include source files for JavaScriptCore @@ -135,9 +135,6 @@ LOCAL_C_INCLUDES := \ external/sqlite/dist \ frameworks/base/core/jni/android/graphics \ $(LOCAL_PATH)/WebCore \ - $(LOCAL_PATH)/WebCore/bridge \ - $(LOCAL_PATH)/WebCore/bridge/c \ - $(LOCAL_PATH)/WebCore/bridge/jni \ $(LOCAL_PATH)/WebCore/css \ $(LOCAL_PATH)/WebCore/dom \ $(LOCAL_PATH)/WebCore/editing \ @@ -175,6 +172,9 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/WebKit/android/nav \ $(LOCAL_PATH)/WebKit/android/plugins \ $(LOCAL_PATH)/WebKit/android/stl \ + $(LOCAL_PATH)/JavaScriptCore/wtf \ + $(LOCAL_PATH)/JavaScriptCore/wtf/unicode \ + $(LOCAL_PATH)/JavaScriptCore/wtf/unicode/icu \ $(BINDING_C_INCLUDES) \ $(base_intermediates)/WebCore/ \ $(base_intermediates)/WebCore/css \ @@ -185,7 +185,8 @@ LOCAL_C_INCLUDES := \ $(base_intermediates)/WebCore/page \ $(base_intermediates)/WebCore/platform \ $(base_intermediates)/WebCore/plugins \ - $(base_intermediates)/WebCore/xml + $(base_intermediates)/WebCore/xml \ + $(base_intermediates)/JavaScriptCore ifeq ($(ENABLE_SVG), true) LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ @@ -218,6 +219,10 @@ endif # Build the list of static libraries LOCAL_STATIC_LIBRARIES := libxml2 +ifeq ($(JS_ENGINE),v8) +LOCAL_STATIC_LIBRARIES += libv8 +endif + # Redefine LOCAL_SRC_FILES to be all the WebKit source files LOCAL_SRC_FILES := $(WEBKIT_SRC_FILES) @@ -239,6 +244,8 @@ include $(BASE_PATH)/WebKit/android/wds/client/Android.mk include $(BASE_PATH)/WebKitTools/android/webkitmerge/Android.mk # Build libv8 +ifeq ($(JS_ENGINE),v8) include $(BASE_PATH)/v8/Android.mk -# Build v8shell include $(BASE_PATH)/v8/Android.v8shell.mk +endif + diff --git a/v8/Android.mk b/v8/Android.mk index eaa1e50..3111951 100644 --- a/v8/Android.mk +++ b/v8/Android.mk @@ -6,7 +6,7 @@ include $(CLEAR_VARS) # Set up the target identity LOCAL_MODULE := libv8 -LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_CLASS := STATIC_LIBRARIES intermediates := $(call local-intermediates-dir) LOCAL_CPP_EXTENSION := .cc @@ -162,4 +162,4 @@ endif LOCAL_C_INCLUDES += $(LOCAL_PATH)/src -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) diff --git a/v8/Android.v8shell.mk b/v8/Android.v8shell.mk index 537987b..ea18166 100644 --- a/v8/Android.v8shell.mk +++ b/v8/Android.v8shell.mk @@ -6,7 +6,7 @@ LOCAL_MODULE := v8shell LOCAL_CPP_EXTENSION := .cc -LOCAL_SHARED_LIBRARIES := libv8 +LOCAL_STATIC_LIBRARIES := libv8 LOCAL_C_INCLUDES += $(LOCAL_PATH)/include |