diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:10:48 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
| commit | 20d7c166a40520f17c44794037344bf8a31c27d1 (patch) | |
| tree | 138fafd8d1a6b5bed59ce426452e134463b6ab04 | |
| parent | d0825bca7fe65beaee391d30da42e937db621564 (diff) | |
| download | external_webkit-20d7c166a40520f17c44794037344bf8a31c27d1.zip external_webkit-20d7c166a40520f17c44794037344bf8a31c27d1.tar.gz external_webkit-20d7c166a40520f17c44794037344bf8a31c27d1.tar.bz2 | |
Merge webkit.org at r54127 : Keep ours for Makefiles.
Change-Id: I120600c8aa2f52cb5b0c69181477863c61f87a11
| -rw-r--r-- | Android.mk | 63 | ||||
| -rw-r--r-- | WebCore/Android.v8bindings.mk | 4 |
2 files changed, 0 insertions, 67 deletions
@@ -221,69 +221,6 @@ ifeq ($(WEBCORE_INSTRUMENTATION),true) LOCAL_CFLAGS += -DANDROID_INSTRUMENT endif -<<<<<<< HEAD -======= -ifeq ($(JAVASCRIPT_ENGINE),v8) -# Include WTF source file. -d := JavaScriptCore -LOCAL_PATH := $(BASE_PATH)/$d -intermediates := $(base_intermediates)/$d -include $(LOCAL_PATH)/Android.v8.wtf.mk -WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) -endif # JAVASCRIPT_ENGINE == v8 - -# Include source files for WebCore -d := WebCore -LOCAL_PATH := $(BASE_PATH)/$d -JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore -intermediates := $(base_intermediates)/$d -include $(LOCAL_PATH)/Android.mk -ifeq ($(JAVASCRIPT_ENGINE),jsc) -include $(LOCAL_PATH)/Android.jscbindings.mk -endif -ifeq ($(JAVASCRIPT_ENGINE),v8) -include $(LOCAL_PATH)/Android.v8bindings.mk -endif -WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) -LOCAL_C_INCLUDES += $(BINDING_C_INCLUDES) - -# Include the derived source files for WebCore. Uses the same path as -# WebCore -include $(LOCAL_PATH)/Android.derived.mk -ifeq ($(JAVASCRIPT_ENGINE),jsc) -include $(LOCAL_PATH)/Android.derived.jscbindings.mk -endif -ifeq ($(JAVASCRIPT_ENGINE),v8) -include $(LOCAL_PATH)/Android.derived.v8bindings.mk -endif - -# Redefine LOCAL_PATH here so the build system is not confused -LOCAL_PATH := $(BASE_PATH) - -# Define our compiler flags -LOCAL_CFLAGS += -Wno-endif-labels -Wno-import -Wno-format -LOCAL_CFLAGS += -fno-strict-aliasing -LOCAL_CFLAGS += -include "WebCorePrefix.h" -LOCAL_CFLAGS += -fvisibility=hidden - -ifeq ($(TARGET_ARCH),arm) -LOCAL_CFLAGS += -Darm -endif - -ifeq ($(ENABLE_SVG),true) -LOCAL_CFLAGS += -DENABLE_SVG=1 -endif - -# Temporary disable SVG_ANIMATION. -ifeq ($(ENABLE_SVG_ANIMATION),true) -LOCAL_CFLAGS += -DENABLE_SVG_ANIMATION=1 -endif - -ifeq ($(WEBCORE_INSTRUMENTATION),true) -LOCAL_CFLAGS += -DANDROID_INSTRUMENT -endif - ->>>>>>> webkit.org at r54127 # LOCAL_LDLIBS is used in simulator builds only and simulator builds are only # valid on Linux LOCAL_LDLIBS += -lpthread -ldl diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index 1576a7c..0bfe1d7 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -173,7 +173,6 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8XMLHttpRequestUploadCustom.cpp LOCAL_SRC_FILES += \ -<<<<<<< HEAD bridge/jni/JNIBridge.cpp \ bridge/jni/JNIUtility.cpp \ bridge/jni/v8/JNIBridgeV8.cpp \ @@ -181,6 +180,3 @@ LOCAL_SRC_FILES += \ bridge/jni/v8/JavaClassV8.cpp \ bridge/jni/v8/JavaInstanceV8.cpp \ bridge/jni/v8/JavaNPObjectV8.cpp -======= - bridge/jni/JNIUtility.cpp ->>>>>>> webkit.org at r54127 |