diff options
| author | Feng Qian <fqian@google.com> | 2009-06-23 16:03:03 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-23 16:03:03 -0700 |
| commit | b576fcb5955e5bcd34a856c1bfd66fff2f04cb09 (patch) | |
| tree | 5226d7cad542fadd73ec13ec014fbc0f9a36c1f2 | |
| parent | 42f994125b08ccfedd92ae35f0e3679a5fc1d24e (diff) | |
| download | external_webkit-b576fcb5955e5bcd34a856c1bfd66fff2f04cb09.zip external_webkit-b576fcb5955e5bcd34a856c1bfd66fff2f04cb09.tar.gz external_webkit-b576fcb5955e5bcd34a856c1bfd66fff2f04cb09.tar.bz2 | |
Build libv8 as a static library.
So no need to change prelink map.
| -rw-r--r-- | Android.v8.mk | 3 | ||||
| -rw-r--r-- | V8Binding/Android.libv8.mk | 4 | ||||
| -rw-r--r-- | V8Binding/Android.v8shell.mk | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Android.v8.mk b/Android.v8.mk index f6845d2..d0da67d 100644 --- a/Android.v8.mk +++ b/Android.v8.mk @@ -207,10 +207,9 @@ LOCAL_SHARED_LIBRARIES := \ ifneq ($(TARGET_SIMULATOR),true) LOCAL_SHARED_LIBRARIES += libdl endif -LOCAL_SHARED_LIBRARIES += libv8 # Build the list of static libraries -LOCAL_STATIC_LIBRARIES := libxml2 +LOCAL_STATIC_LIBRARIES += libxml2 libv8 # Redefine LOCAL_SRC_FILES to be all the WebKit source files LOCAL_SRC_FILES := $(WEBKIT_SRC_FILES) diff --git a/V8Binding/Android.libv8.mk b/V8Binding/Android.libv8.mk index 74a9688..bca0167 100644 --- a/V8Binding/Android.libv8.mk +++ b/V8Binding/Android.libv8.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 @@ -172,4 +172,4 @@ endif LOCAL_C_INCLUDES += $(LOCAL_PATH)/v8/src -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) diff --git a/V8Binding/Android.v8shell.mk b/V8Binding/Android.v8shell.mk index c57d4de..46cf4ee 100644 --- a/V8Binding/Android.v8shell.mk +++ b/V8Binding/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)/v8/include |