# We have to use bison 2.3
include $(BASE_PATH)/bison_check.mk
-<<<<<<< HEAD
SOURCE_PATH := $(BASE_PATH)/Source
WEBCORE_PATH := $(SOURCE_PATH)/WebCore
JAVASCRIPTCORE_PATH := $(SOURCE_PATH)/JavaScriptCore
-WEBKIT_PATH := $(BASE_PATH)/WebKit
+WEBKIT_PATH := $(SOURCE_PATH)/WebKit
WEBCORE_INTERMEDIATES_PATH := $(base_intermediates)/Source/WebCore
-# Build our list of include paths. We include WebKit/android/icu first so that
-=======
# Build our list of include paths. We include Source/WebKit/android/icu first so that
->>>>>>> WebKit.org @ r75993
# any files that include <unicode/ucnv.h> will include our ucnv.h first. We
# also add external/ as an include directory so that we can specify the real
# icu header directory as a more exact reference to avoid including our ucnv.h.
# the right config.h.
LOCAL_C_INCLUDES := \
$(JNI_H_INCLUDE) \
-<<<<<<< HEAD
$(WEBKIT_PATH)/android/icu \
-=======
- $(LOCAL_PATH)/Source/WebKit/android/icu \
->>>>>>> WebKit.org @ r75993
external/ \
external/icu4c/common \
external/icu4c/i18n \
$(SOURCE_PATH)
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
-<<<<<<< HEAD
$(WEBCORE_PATH) \
$(WEBCORE_PATH)/accessibility \
$(WEBCORE_PATH)/bindings/ \
$(WEBCORE_PATH)/websockets \
$(WEBCORE_PATH)/workers \
$(WEBCORE_PATH)/xml
-=======
- $(LOCAL_PATH)/Source/WebKit/android \
- $(LOCAL_PATH)/Source/WebKit/android/WebCoreSupport \
- $(LOCAL_PATH)/Source/WebKit/android/jni \
- $(LOCAL_PATH)/Source/WebKit/android/nav \
- $(LOCAL_PATH)/Source/WebKit/android/plugins \
- $(LOCAL_PATH)/Source/WebKit/android/stl
->>>>>>> WebKit.org @ r75993
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(WEBKIT_PATH)/android \
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(JAVASCRIPTCORE_PATH) \
+ $(JAVASCRIPTCORE_PATH)/collector/handles \
$(JAVASCRIPTCORE_PATH)/wtf \
$(JAVASCRIPTCORE_PATH)/wtf/unicode \
$(JAVASCRIPTCORE_PATH)/wtf/unicode/icu
$(WEBCORE_INTERMEDIATES_PATH) \
$(WEBCORE_INTERMEDIATES_PATH)/css \
$(WEBCORE_INTERMEDIATES_PATH)/html \
- $(WEBCORE_INTERMEDIATES_PATH)/platform
+ $(WEBCORE_INTERMEDIATES_PATH)/platform \
+ $(WEBCORE_INTERMEDIATES_PATH)/xml
# The following includes are needed by the AutoFill feature, or the chrome http
# stack
endif
# Include source files for android WebKit port
-d := WebKit
+d := Source/WebKit
LOCAL_PATH := $(BASE_PATH)/$d
intermediates := $(base_intermediates)/$d
include $(LOCAL_PATH)/Android.mk
LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES)
LOCAL_PATH := $(BASE_PATH)
LOCAL_SRC_FILES := \
- WebKit/android/jni/WebCoreJniOnLoad.cpp
+ Source/WebKit/android/jni/WebCoreJniOnLoad.cpp
ifeq ($(ENABLE_AUTOFILL),true)
# AutoFill requires some cpp files from Chromium to link with
# because they have cpp file extensions, not .cc.
LOCAL_CFLAGS += -DWEBKIT_IMPLEMENTATION=1
LOCAL_SRC_FILES += \
- WebKit/android/WebCoreSupport/autofill/MainThreadProxy.cpp \
- WebKit/chromium/src/WebCString.cpp \
- WebKit/chromium/src/WebRegularExpression.cpp \
- WebKit/chromium/src/WebString.cpp
+ Source/WebKit/android/WebCoreSupport/autofill/MainThreadProxy.cpp \
+ Source/WebKit/chromium/src/WebCString.cpp \
+ Source/WebKit/chromium/src/WebRegularExpression.cpp \
+ Source/WebKit/chromium/src/WebString.cpp
endif
# Do this dependency by hand. The reason we have to do this is because the
include $(BUILD_SHARED_LIBRARY)
# Build the wds client
-include $(BASE_PATH)/WebKit/android/wds/client/Android.mk
+include $(WEBKIT_PATH)/android/wds/client/Android.mk
# Build the performance command line tool.
-include $(BASE_PATH)/WebKit/android/benchmark/Android.mk
+include $(WEBKIT_PATH)/android/benchmark/Android.mk
# Build the webkit merge tool.
include $(BASE_PATH)/Tools/android/webkitmerge/Android.mk