Merge Webkit at r64264 : Fix Makefiles.

Change-Id: Ie4783363cff9eb7f70d6bbfec1a6237b5f5a72b5

diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk
index d55d8ab..a728a4a 100644 (file)
--- a/JavaScriptCore/Android.mk
+++ b/JavaScriptCore/Android.mk
@@ -47,7 +47,6 @@ LOCAL_SRC_FILES := \
        \
        jit/ExecutableAllocator.cpp\
        jit/ExecutableAllocatorFixedVMPool.cpp \
-       jit/ExecutableAllocatorPosix.cpp \
        jit/JIT.cpp \
        jit/JITArithmetic.cpp \
        jit/JITArithmetic32_64.cpp \
@@ -167,7 +166,7 @@ LOCAL_SRC_FILES := \
        wtf/HashTable.cpp \
        wtf/MD5.cpp \
        wtf/MainThread.cpp \
-       jit/PageAllocation.cpp\
+       wtf/PageAllocation.cpp \
        wtf/RandomNumber.cpp \
        wtf/RefCountedLeakCounter.cpp \
        wtf/TCSystemAlloc.cpp \

diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index bca703f..06865c1 100644 (file)
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -612,14 +612,9 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 # These headers are required by the V8 bindings even when Inspector is disabled
 GEN := \
     $(intermediates)/bindings/V8InjectedScriptHost.h \
-<<<<<<< HEAD
     $(intermediates)/bindings/V8Inspector.h \
-    $(intermediates)/bindings/V8InspectorBackend.h \
     $(intermediates)/bindings/V8InspectorFrontendHost.h \
     $(intermediates)/bindings/V8ScriptProfile.h
-=======
-    $(intermediates)/bindings/V8InspectorFrontendHost.h
->>>>>>> webkit.org at r64264
 
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
 $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $<

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index d43fabc..82b444a 100644 (file)
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -189,6 +189,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        dom/UIEvent.cpp \
        dom/UIEventWithKeyState.cpp \
        dom/UserGestureIndicator.cpp \
+       dom/UserTypingGestureIndicator.cpp \
        dom/ViewportArguments.cpp \
        dom/WebKitAnimationEvent.cpp \
        dom/WebKitTransitionEvent.cpp \
@@ -437,6 +438,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        platform/LinkHash.cpp \
        platform/Logging.cpp \
        platform/MIMETypeRegistry.cpp \
+       platform/SchemeRegistry.cpp \
        platform/ScrollView.cpp \
        platform/Scrollbar.cpp \
        platform/ScrollbarThemeComposite.cpp \