diff options
| author | Steve Block <steveblock@google.com> | 2009-11-30 14:56:15 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-01 12:26:55 +0000 |
| commit | 61c7697b40856ef2b0407e11e4f3c7719d37f492 (patch) | |
| tree | 3385dde582919a1c86bf6d1ceed7bf8e167288d8 /WebCore | |
| parent | a8aa6b7d72075facc6ca0672894b0f936669f341 (diff) | |
| download | external_webkit-61c7697b40856ef2b0407e11e4f3c7719d37f492.zip external_webkit-61c7697b40856ef2b0407e11e4f3c7719d37f492.tar.gz external_webkit-61c7697b40856ef2b0407e11e4f3c7719d37f492.tar.bz2 | |
Removes superfluous file V8 DerivedSourcesAllInOne.cpp from Android build.
This was added in https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=6d62749f698529d29ec7cf61f6c8ec323ae52b83#patch1
Also revert Android-specific changes to DerivedSourcesAllInOne.cpp, to avoid future conflicts in WebKit merge.
Change-Id: I783ff698af8212c02c48012f97bd1bc3d90b7ea2
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.v8bindings.mk | 1 | ||||
| -rw-r--r-- | WebCore/bindings/v8/DerivedSourcesAllInOne.cpp | 11 |
2 files changed, 2 insertions, 10 deletions
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index 5326f78..73a0eaf 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -42,7 +42,6 @@ LOCAL_SRC_FILES += \ bindings/v8/DateExtension.cpp \ bindings/v8/DOMData.cpp \ bindings/v8/DOMDataStore.cpp \ - bindings/v8/DerivedSourcesAllInOne.cpp \ bindings/v8/MainThreadDOMData.cpp \ bindings/v8/NPV8Object.cpp \ bindings/v8/RuntimeEnabledFeatures.cpp \ diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp index d8f2bae..0a88da7 100644 --- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp +++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp @@ -98,7 +98,6 @@ #include "bindings/V8File.cpp" #include "bindings/V8FileList.cpp" #include "bindings/V8History.cpp" -#include "bindings/V8Geolocation.cpp" #include "bindings/V8HTMLAllCollection.cpp" #include "bindings/V8HTMLAnchorElement.cpp" #include "bindings/V8HTMLAppletElement.cpp" @@ -188,6 +187,8 @@ #include "bindings/V8NodeIterator.cpp" #include "bindings/V8NodeList.cpp" #include "bindings/V8Notation.cpp" +#include "bindings/V8Notification.cpp" +#include "bindings/V8NotificationCenter.cpp" #include "bindings/V8OverflowEvent.cpp" #include "bindings/V8PageTransitionEvent.cpp" #include "bindings/V8Plugin.cpp" @@ -383,11 +384,3 @@ #if ENABLE(INSPECTOR) #include "bindings/V8InspectorBackend.cpp" #endif - -#if PLATFORM(ANDROID) -// TODO: Upstream NOTIFICATIONS guard. -#if ENABLE(NOTIFICATIONS) -#include "bindings/V8Notification.cpp" -#include "bindings/V8NotificationCenter.cpp" -#endif -#endif |