diff options
| author | Steve Block <steveblock@google.com> | 2009-12-15 11:09:43 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
| commit | dc11ae82374cba25ed19c3e57537cbc667f8efe2 (patch) | |
| tree | bb5704c60977ec2e2a7452f5f36c27e04b0799a0 /Android.mk | |
| parent | 643ca7872b450ea4efacab6188849e5aac2ba161 (diff) | |
| download | external_webkit-dc11ae82374cba25ed19c3e57537cbc667f8efe2.zip external_webkit-dc11ae82374cba25ed19c3e57537cbc667f8efe2.tar.gz external_webkit-dc11ae82374cba25ed19c3e57537cbc667f8efe2.tar.bz2 | |
Merge webkit.org at r51976 : Fix conflicts in Makefiles.
Android Makefiles were upstreamed in http://trac.webkit.org/changeset/51858
and http://trac.webkit.org/changeset/51926
Change-Id: I00f30d4894c1c5064fb7bd9be27317c039dbb0ad
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 0 insertions, 15 deletions
@@ -82,7 +82,6 @@ include $(LOCAL_PATH)/Android.jscbindings.mk endif ifeq ($(JAVASCRIPT_ENGINE),v8) include $(LOCAL_PATH)/Android.v8bindings.mk -<<<<<<< HEAD:Android.mk # TODO: We should use the WebCore JNI code instead. JNI_PATH := V8Binding/jni # bridge/jni path must be listed after V8Bindings, so files are preferentially @@ -97,8 +96,6 @@ JNI_SRC_FILES := \ jni_npobject.cpp \ jni_runtime.cpp WEBKIT_SRC_FILES += $(addprefix $(JNI_PATH)/,$(JNI_SRC_FILES)) -======= ->>>>>>> webkit.org at r51976:Android.mk endif WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) LOCAL_C_INCLUDES := $(BINDING_C_INCLUDES) @@ -113,7 +110,6 @@ ifeq ($(JAVASCRIPT_ENGINE),v8) include $(LOCAL_PATH)/Android.derived.v8bindings.mk endif -<<<<<<< HEAD:Android.mk # Include source files for android WebKit port d := WebKit LOCAL_PATH := $(BASE_PATH)/$d @@ -121,8 +117,6 @@ intermediates := $(base_intermediates)/$d include $(LOCAL_PATH)/Android.mk WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) -======= ->>>>>>> webkit.org at r51976:Android.mk # Redefine LOCAL_PATH here so the build system is not confused LOCAL_PATH := $(BASE_PATH) @@ -134,11 +128,8 @@ LOCAL_CFLAGS += -fvisibility=hidden ifeq ($(TARGET_ARCH),arm) LOCAL_CFLAGS += -Darm -<<<<<<< HEAD:Android.mk # remove this warning: "note: the mangling of 'va_list' has changed in GCC 4.4" LOCAL_CFLAGS += -Wno-psabi -======= ->>>>>>> webkit.org at r51976:Android.mk endif ifeq ($(ENABLE_SVG),true) @@ -339,7 +330,6 @@ LOCAL_LDFLAGS := -fvisibility=hidden LOCAL_CFLAGS := $(WEBKIT_CFLAGS) LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES) LOCAL_PATH := $(BASE_PATH) -<<<<<<< HEAD:Android.mk LOCAL_SRC_FILES := \ WebKit/android/jni/WebCoreJniOnLoad.cpp # Do this dependency by hand. The reason we have to do this is because the @@ -347,10 +337,7 @@ LOCAL_SRC_FILES := \ # We make all of our object files depend on those files so that they are built # before we try to compile the file. LOCAL_ADDITIONAL_DEPENDENCIES := $(filter %.h, $(WEBKIT_GENERATED_SOURCES)) -======= ->>>>>>> webkit.org at r51976:Android.mk include $(BUILD_SHARED_LIBRARY) -<<<<<<< HEAD:Android.mk # Build the wds client include $(BASE_PATH)/WebKit/android/wds/client/Android.mk @@ -360,5 +347,3 @@ include $(BASE_PATH)/WebKit/android/benchmark/Android.mk # Build the webkit merge tool. include $(BASE_PATH)/WebKitTools/android/webkitmerge/Android.mk -======= ->>>>>>> webkit.org at r51976:Android.mk |