diff options
| author | Feng Qian <fqian@google.com> | 2009-04-29 11:31:40 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-04-29 11:31:40 -0700 |
| commit | 24f6fb973b8bafd2ffeba4f29bad397e590878fc (patch) | |
| tree | 55301b4e49b04ab3acfd8871d4ba82b06c116a1b /Android.mk | |
| parent | 7fa30a60f66c19c8e6fb91ef799bca4d8d6f57f2 (diff) | |
| download | external_webkit-24f6fb973b8bafd2ffeba4f29bad397e590878fc.zip external_webkit-24f6fb973b8bafd2ffeba4f29bad397e590878fc.tar.gz external_webkit-24f6fb973b8bafd2ffeba4f29bad397e590878fc.tar.bz2 | |
Chagne JS_ENGINE to ENABLE_V8.
To enable V8, set ENABLE_V8 := true in the buildspec.mk in the home directory.
Also fixed one SVG build issue in JSC build case.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 31 |
1 files changed, 14 insertions, 17 deletions
@@ -32,11 +32,19 @@ WEBKIT_SRC_FILES := # We have to use bison 2.3 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 := v8 +ifeq ($(ENABLE_V8),true) + +d := V8Binding +LOCAL_PATH := $(BASE_PATH)/$d +WEBCORE_PATH := $(BASE_PATH)/WebCore +intermediates := $(base_intermediates)/WebCore +JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore +include $(LOCAL_PATH)/V8Binding.derived.mk +WEBKIT_SRC_FILES += $(addprefix $d/, $(LOCAL_SRC_FILES)) +WEBKIT_SRC_FILES += $(addprefix WebCore/, $(WEBCORE_SRC_FILES)) + +else # use JSC engine -ifeq ($(JS_ENGINE),jsc) # Include source files for JavaScriptCore d := JavaScriptCore LOCAL_PATH := $(BASE_PATH)/$d @@ -52,17 +60,6 @@ intermediates := $(base_intermediates)/$d include $(LOCAL_PATH)/JavaScriptCore.derived.mk WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) -else # JS_ENGINE == v8 - -d := V8Binding -LOCAL_PATH := $(BASE_PATH)/$d -WEBCORE_PATH := $(BASE_PATH)/WebCore -intermediates := $(base_intermediates)/WebCore -JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore -include $(LOCAL_PATH)/V8Binding.derived.mk -WEBKIT_SRC_FILES += $(addprefix $d/, $(LOCAL_SRC_FILES)) -WEBKIT_SRC_FILES += $(addprefix WebCore/, $(WEBCORE_SRC_FILES)) - endif @@ -219,7 +216,7 @@ endif # Build the list of static libraries LOCAL_STATIC_LIBRARIES := libxml2 -ifeq ($(JS_ENGINE),v8) +ifeq ($(ENABLE_V8),true) LOCAL_STATIC_LIBRARIES += libv8 endif @@ -244,7 +241,7 @@ include $(BASE_PATH)/WebKit/android/wds/client/Android.mk include $(BASE_PATH)/WebKitTools/android/webkitmerge/Android.mk # Build libv8 -ifeq ($(JS_ENGINE),v8) +ifeq ($(ENABLE_V8),true) include $(BASE_PATH)/v8/Android.mk include $(BASE_PATH)/v8/Android.v8shell.mk endif |