summaryrefslogtreecommitdiffstats
path: root/WebCore/Android.mk
diff options
context:
space:
mode:
authorLeon Clarke <leonclarke@google.com>2010-06-03 15:49:24 +0100
committerLeon Clarke <leonclarke@google.com>2010-06-08 12:24:52 +0100
commit3fb93b9fa36ddaa580600d3a2e94ba3ab0cb1ded (patch)
tree3a1c736c2b67e596d9875c57593772760adeb43b /WebCore/Android.mk
parent4661b323d4bfa799928ba102f29ce8be00fb5dfa (diff)
downloadexternal_webkit-3fb93b9fa36ddaa580600d3a2e94ba3ab0cb1ded.zip
external_webkit-3fb93b9fa36ddaa580600d3a2e94ba3ab0cb1ded.tar.gz
external_webkit-3fb93b9fa36ddaa580600d3a2e94ba3ab0cb1ded.tar.bz2
Merge webkit.org at r60469 : Fix Makefiles.
Change-Id: Iaa99d053248875da694b806b913fe43922134cbb
Diffstat (limited to 'WebCore/Android.mk')
-rw-r--r--WebCore/Android.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index e6840c0..8f7c749 100644
--- 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 \