diff options
| author | Steve Block <steveblock@google.com> | 2010-07-09 00:17:52 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-07-09 15:33:40 +0100 |
| commit | 1c96ea431fd2eeb95d518d86ac5d1ec43999d717 (patch) | |
| tree | 36fe600498405386e9a4075bde0a19c810d5a62a | |
| parent | 919eb425b73bb532c128aa974a43e3c959c5a10a (diff) | |
| download | external_webkit-1c96ea431fd2eeb95d518d86ac5d1ec43999d717.zip external_webkit-1c96ea431fd2eeb95d518d86ac5d1ec43999d717.tar.gz external_webkit-1c96ea431fd2eeb95d518d86ac5d1ec43999d717.tar.bz2 | |
Merge WebKit at r62496: Fix Makefiles
New files added in http://trac.webkit.org/changeset/62215
Change-Id: I8fd5b51f0c38396060fac61d64bc8d159e234a5d
| -rw-r--r-- | WebCore/Android.derived.jscbindings.mk | 1 | ||||
| -rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 1 | ||||
| -rw-r--r-- | WebCore/Android.jscbindings.mk | 1 | ||||
| -rw-r--r-- | WebCore/Android.mk | 2 |
4 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk index 799c41d..c9d5b55 100644 --- a/WebCore/Android.derived.jscbindings.mk +++ b/WebCore/Android.derived.jscbindings.mk @@ -105,6 +105,7 @@ GEN := \ $(intermediates)/dom/JSDOMCoreException.h \ $(intermediates)/dom/JSDOMImplementation.h \ $(intermediates)/dom/JSDOMStringList.h \ + $(intermediates)/dom/JSDOMStringMap.h \ $(intermediates)/dom/JSDeviceOrientationEvent.h \ $(intermediates)/dom/JSDocument.h \ $(intermediates)/dom/JSDocumentFragment.h \ diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index 45d8de4..216e200 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -89,6 +89,7 @@ GEN := \ $(intermediates)/bindings/V8DOMCoreException.h \ $(intermediates)/bindings/V8DOMImplementation.h \ $(intermediates)/bindings/V8DOMStringList.h \ + $(intermediates)/bindings/V8DOMStringMap.h \ $(intermediates)/bindings/V8DeviceOrientationEvent.h \ $(intermediates)/bindings/V8Document.h \ $(intermediates)/bindings/V8DocumentFragment.h \ diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk index 56c8908..e2f0fb6 100644 --- a/WebCore/Android.jscbindings.mk +++ b/WebCore/Android.jscbindings.mk @@ -85,6 +85,7 @@ LOCAL_SRC_FILES += \ bindings/js/JSDOMBinding.cpp \ bindings/js/JSDOMFormDataCustom.cpp \ bindings/js/JSDOMGlobalObject.cpp \ + bindings/js/JSDOMStringMapCustom.cpp \ bindings/js/JSDOMWindowBase.cpp \ bindings/js/JSDOMWindowCustom.cpp \ bindings/js/JSDOMWindowShell.cpp \ diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 1475fca..007261c 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -119,6 +119,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/CustomEvent.cpp \ dom/DOMImplementation.cpp \ dom/DOMStringList.cpp \ + dom/DOMStringMap.cpp \ + dom/DatasetDOMStringMap.cpp \ dom/DecodedDataDocumentParser.cpp \ dom/Document.cpp \ dom/DocumentFragment.cpp \ |