Merge webkit.org at r60469 : Fix Makefiles.

Change-Id: Iaa99d053248875da694b806b913fe43922134cbb

diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index 1a1e68b..77e1c48 100644 (file)
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -337,10 +337,6 @@ GEN := \
     $(intermediates)/bindings/V8Database.h \
     $(intermediates)/bindings/V8DatabaseCallback.h \
     $(intermediates)/bindings/V8DatabaseSync.h \
-    $(intermediates)/bindings/V8IDBEvent.h \
-    $(intermediates)/bindings/V8IDBErrorEvent.h \
-    $(intermediates)/bindings/V8IDBRequest.h \
-    $(intermediates)/bindings/V8IDBSuccessEvent.h \
     $(intermediates)/bindings/V8SQLError.h \
     $(intermediates)/bindings/V8SQLResultSet.h \
     $(intermediates)/bindings/V8SQLResultSetRowList.h \

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index e6840c0..8f7c749 100644 (file)
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -276,6 +276,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        html/HTMLTokenizer.cpp \
        html/HTMLViewSourceDocument.cpp \
        html/ImageData.cpp \
+       html/LabelsNodeList.cpp \
        html/PreloadScanner.cpp \
        html/StepRange.cpp \
        html/TimeRanges.cpp \
@@ -401,6 +402,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        platform/GeolocationService.cpp \
        platform/KURL.cpp \
        platform/KURLGoogle.cpp \
+       platform/KillRingNone.cpp \
        platform/Length.cpp \
        platform/LinkHash.cpp \
        platform/Logging.cpp \
@@ -589,7 +591,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        plugins/PluginArray.cpp \
        plugins/PluginData.cpp \
        plugins/PluginDatabase.cpp \
-       plugins/PluginInfoStore.cpp \
        plugins/PluginMainThreadScheduler.cpp \
        plugins/PluginPackage.cpp \
        plugins/PluginStream.cpp \
@@ -777,7 +778,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        storage/IDBSuccessEvent.cpp \
        storage/IndexedDatabase.cpp \
        storage/IndexedDatabaseImpl.cpp \
-       storage/IndexedDatabaseRequest.cpp
+       storage/IndexedDatabaseRequest.cpp \
        storage/LocalStorageTask.cpp \
        storage/LocalStorageThread.cpp \
        storage/OriginQuotaManager.cpp \